puppet-blacksmith 3.1.1 → 3.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MjI2ZGE0MjZiNzVlMDhmMjI2NDVkMTk5NTRkZWI1OWFkZmUzY2JkOA==
-  data.tar.gz: !binary |-
-    MGQ5ZjA4ODM1M2ZkY2ZhY2M4ZTIyOTc5NGU4MDllYjA3ODU0YzczMA==
+SHA1:
+  metadata.gz: a8de434a181f1a14aa9077c263e96d7d03981f47
+  data.tar.gz: 2a6ce31ae7e5bc58c2b48f0eefc5a89aeeb16bcb
 SHA512:
-  metadata.gz: !binary |-
-    YjQxMGEzZjdkYTUxNjFhYWJiZDE0OTRjYzJlYTE4MTUxZmM5NDliODRmNDdj
-    ZjZhODBmZjQ4ZGRkZTYzZGRjYjI3Y2I5MzU5NDNkZWU3OGE0M2QwMjMyNTNl
-    ZGFiMzNjZTk0OGY2NjM0OTcyNmRiYTU3MWNhMTg3MTk2MTJjMGM=
-  data.tar.gz: !binary |-
-    YjUxMWZkNjgzOWI5ZDVhNTk0YjFjNzk4N2I2MzJhYjU1OGI3NjQ3YTlmZTZi
-    Y2FmOWNlMWUyNjU2YWM1NGExNmNiOTFlMGM2MThiNDMzNjQzNzkzZDYwYzkw
-    ZWU0Y2FkY2YzZTk1ODc5YzU1OTJkZjA0OWUzYTY3NTgyMWEzNjA=
+  metadata.gz: 39e36ebfbb8a9579b2618bfa08185b547b0612aa392b42e776b4171d4ce0e4826ed396e59ea8737581c465e95b95e72949c3edc9a21690390e8ba244580d9cd0
+  data.tar.gz: 8e4d2d9837ff3154cb0e16e137c50f7082a30692ec542a4da9edf02d011509e9cef2c90527f14ef463547f837c68c7386096c05cf67207eee3e6259f607414fd

data/lib/puppet_blacksmith/modulefile.rb

@@ -11,6 +11,7 @@
 # require 'puppet/module_tool'
 require 'puppet'
 require 'puppet/module_tool'
+require 'puppet_blacksmith/version_helper'
 
 Puppet[:confdir] = "."
 
@@ -51,14 +52,18 @@ module Blacksmith
       metadata['version']
     end
 
-    def bump!
-      new_version = increase_version(version)
+    def bump!(level = :patch)
+      new_version = increase_version(version, level)
       text = File.read(path)
       text = replace_version(text, new_version)
       File.open(path, "w") {|file| file.puts text}
       new_version
     end
 
+    [:major, :minor, :patch].each do |level|
+      define_method("bump_#{level}!") { bump!(level) }
+    end
+
     def bump_dep!(module_name, version)
       text = File.read(path)
       text = replace_dependency_version(text, module_name, version)
@@ -75,10 +80,9 @@ module Blacksmith
       end
     end
 
-    def increase_version(version)
-      v = Gem::Version.new("#{version}.0")
-      raise Blacksmith::Error, "Unable to increase prerelease version #{version}" if v.prerelease?
-      v.bump.to_s
+    def increase_version(version, level = :patch)
+      v = VersionHelper::Version.new(version)
+      v.send("#{level}!").to_s
     end
 
     def replace_dependency_version(text, module_name, version)

data/lib/puppet_blacksmith/rake_tasks.rb

@@ -18,16 +18,38 @@ module Blacksmith
       task_block.call(*[self, args].slice(0, task_block.arity)) if task_block
 
       # clear any (auto-)pre-existing task
-      [:bump, :tag, :bump_commit, :push, :clean, :release, :dependency].each do |t|
+      [
+        :bump,
+        :bump_major,
+        :bump_minor,
+        :bump_patch,
+        :tag,
+        :bump_commit,
+        :push,
+        :clean,
+        :release,
+        :dependency
+      ].each do |t|
         Rake::Task.task_defined?("module:#{t}") && Rake::Task["module:#{t}"].clear
       end
 
       namespace :module do
 
-        desc "Bump module version to the next minor"
+        namespace :bump do
+          [:major, :minor, :patch].each do |level|
+            desc "Bump module version to the next #{level.upcase} version"
+            task level do
+              m = Blacksmith::Modulefile.new
+              v = m.send("bump_#{level}!")
+              puts "Bumping version from #{m.version} to #{v}"
+            end
+          end
+        end
+
+        desc "Bump module version to the next patch"
         task :bump do
           m = Blacksmith::Modulefile.new
-          v = m.bump!
+          v = m.bump_patch!
           puts "Bumping version from #{m.version} to #{v}"
         end
 

data/lib/puppet_blacksmith/version.rb

@@ -1,3 +1,3 @@
 module Blacksmith
-  VERSION = '3.1.1'
+  VERSION = '3.2.0'
 end

data/lib/puppet_blacksmith/version_helper.rb

@@ -0,0 +1,170 @@
+# Need to vendor the 'semantic' gem because Puppet hasn't appropriately
+# encapsulated their vendored implementation.
+#
+# For the original implementation see https://github.com/jlindsey/semantic
+#
+module Blacksmith
+  module VersionHelper
+    # See: http://semver.org
+    class Version
+      SemVerRegexp = /\A(\d+\.\d+\.\d+)(-([0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*))?(\+([0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*))?\Z/
+      attr_accessor :major, :minor, :patch, :pre, :build
+
+      def initialize version_str
+        raise ArgumentError.new("#{version_str} is not a valid SemVer Version (http://semver.org)") unless version_str =~ SemVerRegexp
+
+        version, parts = version_str.split '-'
+        if not parts.nil? and parts.include? '+'
+          @pre, @build = parts.split '+'
+        elsif version.include? '+'
+          version, @build = version.split '+'
+        else
+          @pre = parts
+        end
+
+
+        @major, @minor, @patch = version.split('.').map(&:to_i)
+      end
+
+      def to_a
+        [@major, @minor, @patch, @pre, @build]
+      end
+
+      def to_s
+        str = [@major, @minor, @patch].join '.'
+        str << '-' << @pre unless @pre.nil?
+        str << '+' << @build unless @build.nil?
+
+        str
+      end
+
+      def to_h
+        keys = [:major, :minor, :patch, :pre, :build]
+        Hash[keys.zip(self.to_a)]
+      end
+
+      alias to_hash to_h
+      alias to_array to_a
+      alias to_string to_s
+
+      def <=> other_version
+        other_version = Version.new(other_version) if other_version.is_a? String
+
+        v1 = self.dup
+        v2 = other_version.dup
+
+        # The build must be excluded from the comparison, so that e.g. 1.2.3+foo and 1.2.3+bar are semantically equal.
+        # "Build metadata SHOULD be ignored when determining version precedence".
+        # (SemVer 2.0.0-rc.2, paragraph 10 - http://www.semver.org)
+        v1.build = nil
+        v2.build = nil
+
+        compare_recursively(v1.to_a, v2.to_a)
+      end
+
+      def > other_version
+        (self <=> other_version) == 1
+      end
+
+      def < other_version
+        (self <=> other_version) == -1
+      end
+
+      def >= other_version
+        (self <=> other_version) >= 0
+      end
+
+      def <= other_version
+        (self <=> other_version) <= 0
+      end
+
+      def == other_version
+        (self <=> other_version) == 0
+      end
+
+      def satisfies other_version
+        return true if other_version.strip == '*'
+        parts = other_version.split(/(\d(.+)?)/, 2)
+        comparator, other_version_string = parts[0].strip, parts[1].strip
+
+        begin
+          Version.new other_version_string
+          comparator.empty? && comparator = '=='
+          satisfies_comparator? comparator, other_version_string
+        rescue ArgumentError
+          if ['<', '>', '<=', '>='].include?(comparator)
+            satisfies_comparator? comparator, pad_version_string(other_version_string)
+          else
+            tilde_matches? other_version_string
+          end
+        end
+      end
+
+      [:major, :minor, :patch].each do |term|
+        define_method("#{term}!") { increment!(term) }
+      end
+
+      def increment!(term)
+        new_version = clone
+        new_value = send(term) + 1
+
+        new_version.send("#{term}=", new_value)
+        new_version.minor = 0 if term == :major
+        new_version.patch = 0 if term == :major || term == :minor
+        new_version.build = new_version.pre = nil
+
+        new_version
+      end
+
+      private
+
+      def pad_version_string version_string
+        parts = version_string.split('.').reject {|x| x == '*'}
+        while parts.length < 3
+          parts << '0'
+        end
+        parts.join '.'
+      end
+
+      def tilde_matches? other_version_string
+        this_parts = to_a.collect(&:to_s)
+        other_parts = other_version_string.split('.').reject {|x| x == '*'}
+        other_parts == this_parts[0..other_parts.length-1]
+      end
+
+      def satisfies_comparator? comparator, other_version_string
+        if comparator == '~'
+          tilde_matches? other_version_string
+        else
+          self.send comparator, other_version_string
+        end
+      end
+
+      def compare_recursively ary1, ary2
+        # Short-circuit the recursion entirely if they're just equal
+        return 0 if ary1 == ary2
+
+        a = ary1.shift; b = ary2.shift
+
+        # Reached the end of the arrays, equal all the way down
+        return 0 if a.nil? and b.nil?
+
+        # Mismatched types (ie. one has a pre and the other doesn't)
+        if a.nil? and not b.nil?
+          return 1
+        elsif not a.nil? and b.nil?
+          return -1
+        end
+
+        if a < b
+          return -1
+        elsif a > b
+          return 1
+        end
+
+        # Versions are equal thus far, so recurse down to the next part.
+        compare_recursively ary1, ary2
+      end
+    end
+  end
+end

data/spec/puppet_blacksmith/modulefile_spec.rb

@@ -153,9 +153,27 @@ eos
   end
 
   describe 'increase_version' do
-    it { expect(subject.increase_version("1.0")).to eql("1.1") }
     it { expect(subject.increase_version("1.0.0")).to eql("1.0.1") }
     it { expect(subject.increase_version("1.0.1")).to eql("1.0.2") }
+    it { expect { subject.increase_version("1.0") }.to raise_error }
     it { expect { subject.increase_version("1.0.12qwe") }.to raise_error }
   end
+
+  describe 'bump patch version' do
+    it { expect(subject.increase_version("1.0.0", :patch)).to eql("1.0.1") }
+    it { expect(subject.increase_version("1.1.0", :patch)).to eql("1.1.1") }
+    it { expect(subject.increase_version("1.1.1", :patch)).to eql("1.1.2") }
+  end
+
+  describe 'bump minor version' do
+    it { expect(subject.increase_version("1.0.0", :minor)).to eql("1.1.0") }
+    it { expect(subject.increase_version("1.1.0", :minor)).to eql("1.2.0") }
+    it { expect(subject.increase_version("1.1.1", :minor)).to eql("1.2.0") }
+  end
+
+  describe 'bump major version' do
+    it { expect(subject.increase_version("1.0.0", :major)).to eql("2.0.0") }
+    it { expect(subject.increase_version("1.1.0", :major)).to eql("2.0.0") }
+    it { expect(subject.increase_version("1.1.1", :major)).to eql("2.0.0") }
+  end
 end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: puppet-blacksmith
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - MaestroDev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: puppet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.16
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: puppetlabs_spec_helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Puppet module tools for development and Puppet Forge management
@@ -138,6 +138,7 @@ files:
 - lib/puppet_blacksmith/modulefile.rb
 - lib/puppet_blacksmith/rake_tasks.rb
 - lib/puppet_blacksmith/version.rb
+- lib/puppet_blacksmith/version_helper.rb
 - spec/data/Modulefile
 - spec/data/maestrodev-test/metadata.json
 - spec/data/metadata.json
@@ -157,28 +158,28 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Tasks to manage Puppet module builds
 test_files:
+- spec/data/maestrodev-test/metadata.json
 - spec/data/metadata.json
-- spec/data/response.json
 - spec/data/Modulefile
-- spec/data/maestrodev-test/metadata.json
-- spec/puppet_blacksmith/modulefile_spec.rb
-- spec/puppet_blacksmith/git_spec.rb
+- spec/data/response.json
+- spec/puppet_blacksmith/forge_live_spec.rb
 - spec/puppet_blacksmith/forge_shared.rb
 - spec/puppet_blacksmith/forge_spec.rb
-- spec/puppet_blacksmith/forge_live_spec.rb
+- spec/puppet_blacksmith/git_spec.rb
+- spec/puppet_blacksmith/modulefile_spec.rb
 - spec/spec_helper.rb