bozo-scripts 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/bozo/hooks/git_commit_hashes.rb

@@ -5,6 +5,17 @@ module Bozo::Hooks
     def post_dependencies
       env['GIT_HASH'] = `git log -1 --format="%h"`.strip
       env['GIT_HASH_FULL'] = `git log -1 --format="%H"`.strip
+      env['BUILD_VERSION'] = build_version
+    end
+
+    private
+
+    def build_version
+      if pre_release?
+        Bozo::Versioning::Version.new(version.major, version.minor, version.patch, "pre#{env['GIT_HASH']}")
+      else
+        version
+      end
     end
     
   end

data/lib/bozo/hooks/git_tag_release.rb

@@ -6,9 +6,9 @@ module Bozo::Hooks
 
     def post_publish
       return unless build_server?
-      log_info "Tagging repository for release #{version}"
+      log_info "Tagging repository for release #{env['BUILD_VERSION']}"
 
-      tag_name = "rel-#{version}"
+      tag_name = "rel-#{env['BUILD_VERSION']}"
 
       if `git tag`.split("\n").include? tag_name
         raise Bozo::ConfigurationError.new "The tag #{tag_name} already exists"

data/lib/bozo/packagers/nuget.rb

@@ -54,13 +54,7 @@ module Bozo::Packagers
 
     # Returns the version that the package should be given.
     def package_version
-      # If running on a build server then it is a real release, otherwise it is
-      # a preview release and the version should reflect that.
-      if pre_release?
-        "#{version}-pre#{env['GIT_HASH']}"
-      else
-        version
-      end
+      env['BUILD_VERSION']
     end
 
     private

data/lib/bozo/packagers/rubygems.rb

@@ -16,21 +16,35 @@ module Bozo::Packagers
     private
 
     def build_gem(spec)
-      version_file = File.expand_path(File.dirname(File.realpath(__FILE__)) + '/../../../VERSION')
-
       if pre_release?
-        File.open(version_file, 'w') { |f| f << "#{version}.pre#{env['GIT_HASH']}" }
+        package_version.write_to_file
       end
 
       begin
         execute_command :rubygems, ['gem', 'build', spec]
       ensure
         if pre_release?
-          File.open(version_file, 'w') { |f| f << version.to_s }
+          version.write_to_file
         end
       end
     end
 
+    def package_version
+      RubyGemVersion.parse(env['BUILD_VERSION'])
+    end
+
+    class RubyGemVersion < Bozo::Versioning::Version
+
+      def self.parse(version)
+        new version.major, version.minor, version.patch, version.extension
+      end
+
+      def to_s
+        "#{major}.#{minor}.#{patch}.#{extension}"
+      end
+
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bozo-scripts
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -67,7 +67,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.3.7
 - !ruby/object:Gem::Dependency
   name: zip
   requirement: !ruby/object:Gem::Requirement
@@ -141,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2539903823020422155
+      hash: 95684068576653217
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2539903823020422155
+      hash: 95684068576653217
 requirements: []
 rubyforge_project: bozo-scripts
 rubygems_version: 1.8.24