maestro-plugin-rake-tasks 1.0.2 → 1.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maestro-plugin-rake-tasks (1.0.2)
+    maestro-plugin-rake-tasks (1.0.3)
       git
       json (>= 1.4.6)
       nokogiri

data/lib/maestro/plugin/rake_tasks/package_task.rb

@@ -95,11 +95,8 @@ module Maestro
           abort "ERROR: Plugin name is missing" unless @plugin_name
           abort "ERROR: Plugin version is missing" unless @version
 
-          # Add the commit hash to the version if it's available
-          git_version! if File.exists?('.git')
-
           # If we use a template, use it to create the manifest
-          update_manifest if File.exists?(@manifest_template_path)
+          update_manifest(git_version)
 
           # Create the zip file
           create_zip_file("#{@plugin_name}-#{@version}.zip")
@@ -116,25 +113,27 @@ module Maestro
           @version ||= doc.at_xpath('/xmlns:project/xmlns:version').text
         end
 
-        def git_version!
+        def git_version
           git = Git.open('.')
           # check if there are modified files
           if git.status.select { |s| s.type == 'M' }.empty?
             commit = git.log.first.sha[0..5]
-            @version = "#{@version}-#{commit}"
+            "#{@version}-#{commit}"
           else
             warn "WARNING: There are modified files, not using commit hash in version"
+            @version
           end
-          @version
         end
 
         # update the version number in the manifest file.
-        def update_manifest
+        def update_manifest(manifest_version)
+          return @version unless File.exists?('.git')
+
           manifest = JSON.parse(IO.read(@manifest_template_path))
           if manifest.instance_of? Array
-            manifest.each { |m| m['version'] = @version }
+            manifest.each { |m| m['version'] = manifest_version }
           else
-            manifest['version'] = @version
+            manifest['version'] = manifest_version
           end
 
           File.open('manifest.json','w'){ |f| f.write(JSON.pretty_generate(manifest)) }

data/lib/maestro/plugin/rake_tasks/version.rb

@@ -1,7 +1,7 @@
 module Maestro
   module Plugin
     module RakeTasks
-        VERSION = '1.0.2'
+        VERSION = '1.0.3'
     end
   end
 end

data/spec/maestro/plugin/rake_tasks/package_task_spec.rb

@@ -65,7 +65,7 @@ describe Maestro::Plugin::RakeTasks::PackageTask do
     manifest_path = File.dirname(__FILE__) + '/../../../../manifest.json'
     File.exists?(manifest_path).should be_true
     manifest = JSON.parse(IO.read(manifest_path))
-    manifest.first['version'].should == 'X.Y.Z'
+    manifest.first['version'].should start_with 'X.Y.Z'
 
   end
 
@@ -78,7 +78,7 @@ describe Maestro::Plugin::RakeTasks::PackageTask do
     manifest_path = File.dirname(__FILE__) + '/../../../../manifest.json'
     File.exists?(manifest_path).should be_true
     manifest = JSON.parse(IO.read(manifest_path))
-    manifest['version'].should == 'X.Y.Z'
+    manifest['version'].should start_with 'X.Y.Z'
 
   end
 

metadata

@@ -2,7 +2,7 @@
 name: maestro-plugin-rake-tasks
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
   - Etienne Pelletier