Please review pull request #1: Setup hiera-json for release opened by (stahnma)

Description:

  • Switch to Puppet Labs branding
  • Remove deprecated package task
  • Add in versioning based upon git describe

  • Opened: Fri Jan 13 01:02:34 UTC 2012
  • Based on: puppetlabs:master (0e070bc138401b96cd28a59337bb1e7f33cce6d4)
  • Requested merge: stahnma:release (92bc88eb96e002100d84261aa35cce027ca966b1)

Diff follows:

diff --git a/Rakefile b/Rakefile
index 76c8b02..a5cdc7a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,24 +1,25 @@
 require 'rubygems'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'rspec/core/rake_task'
+require 'tasks/release'
 
 spec = Gem::Specification.new do |s|
   s.name = "hiera-json"
-  s.version = "0.2.0"
-  s.author = "R.I.Pienaar"
-  s.email = "[email protected]"
-  s.homepage = "https://github.com/ripienaar/hiera-json/"
+  s.version = described_version
+  s.author = "Puppet Labs"
+  s.email = "[email protected]"
+  s.homepage = "https://github.com/puppetlabs/hiera-json/"
   s.summary = "JSON backend for the Hiera hierarcical data store"
   s.description = "Store Hiera data in JSON"
   s.files = FileList["lib/**/*"].to_a
   s.require_path = "lib"
-  s.test_files = FileList["{spec}/**/*spec.rb"].to_a
+  s.test_files = FileList["spec/**/*.rb"].to_a
   s.has_rdoc = true
-  s.add_dependency 'hiera', '~>0.2.0'
+  s.add_dependency 'hiera', '~>0.3.0'
   s.add_dependency 'json'
 end
 
-Rake::GemPackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do  |pkg|
   pkg.need_tar = true
 end
 
diff --git a/tasks/release.rb b/tasks/release.rb
new file mode 100644
index 0000000..b472d5a
--- /dev/null
+++ b/tasks/release.rb
@@ -0,0 +1,17 @@
+
+def described_version
+    # This ugly bit removes the gSHA1 portion of the describe as that causes failing tests
+    %x{git describe}.gsub('-', '.').split('.')[0..3].join('.').to_s.gsub('v', '')
+end
+
+namespace :pkg do
+
+  desc "Build Package"
+  task :release => [ :default ] do
+    Rake::Task[:package].invoke
+  end
+
+end # namespace
+
+task :clean => [ :clobber_package ] do
+end

    

--
You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected].
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.

Reply via email to