puppet-blacksmith 3.0.3 → 3.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGI4M2FiZTBmMzY4ODVmZWY1YWUwZDkwODY5M2Q3M2YwZDFjYTliZA==
+    NGJhY2U2NDIxMDJlNTY5Nzk5ODg2ZDNhNmExMDNmMDYzYTkwNjE3Mg==
   data.tar.gz: !binary |-
-    OTgyOTQ3ZGYxMGMxYmQ1Zjc4M2Y4ZjI3OTc0MjFiZjE2NzljNmI2MA==
+    OTg0ZGM3NzI0Nzg1MWM3MDlhNWNjZTE4YzBkODU2MDQ4OThiZmI4OQ==
 SHA512:
   metadata.gz: !binary |-
-    ZGEyYjk5ZWNmNzNhNTIxMzQ2NTk1YzY4MGNhNjYyZTYwYTI4NjQ5OWI0NGRj
-    YmQ2ODRjMjMyY2UxNGRhMjI1OGNlYzQxZjRiMjk5ZjM3ODhhZmE2MzI4NjUx
-    Njc1OWZkY2U1MDMxNTY2OTk5MmE0ZjNkNjliMmYyNTA5MmVjODg=
+    YmM2ODBkOTJmZjQ2OWM3YzYyNjk4Y2QzOGIwNDQ3YWNiNTQwNTllY2MyM2I2
+    OTVkN2MxMWExOTkxNTE4YjZkNjJhYWZmNDBjYzQ4NWY1N2FlYjk0ZDkyZjRl
+    NGM2NDcwM2FhZDlhNmI4ZjZhYjA5MTYxMzJhMDJmNTEyOTRmNTI=
   data.tar.gz: !binary |-
-    MjU3MDMwZGYwZDAzZWY5NzE1MTcwODEwMjhjYTAyYzNiZjNlZmJkMjY2MDhh
-    YTNhNTA3MmZlNDM2MDgyNTk1NDNmYjVjNzlkN2RhZDUzN2Q5MjdjZGQ0YTlk
-    YTgwOTU2YzhhNTA0ZWZmYTFjYmU2YTIyMDI5MmI0NWZiYmViZGI=
+    ZWEyNTI4MTNiYWQ2NzU1MGFkYmE5ZDA3NzNlZmEyNGQwMzk5OTZhOGUyYmY4
+    ZTQyMWRjYjk0ZDBiNjgzYWFhYWM1ZGJjY2UwMjI4YzZhMjA0N2E0YmI0OTc2
+    OWYxNjM1MTMyMTc5NGM1NzBkZjY5MzU4ZDRhNzA3MDRhN2JmYWQ=

data/lib/puppet_blacksmith/git.rb

@@ -3,14 +3,21 @@ require 'open3'
 module Blacksmith
   class Git
 
-    attr_accessor :path
+    attr_accessor :path, :tag_pattern
+    attr_writer :tag_pattern
+
+    # Pattern to use for tags, %s is replaced with the actual version
+    def tag_pattern
+      @tag_pattern || 'v%s'
+    end
 
     def initialize(path = ".")
       @path = File.expand_path(path)
     end
 
     def tag!(version)
-      exec_git "tag v#{version}"
+      tag = tag_pattern % version
+      exec_git "tag #{tag}"
     end
 
     def commit_modulefile!(version)

data/lib/puppet_blacksmith/modulefile.rb

@@ -59,6 +59,12 @@ module Blacksmith
       new_version
     end
 
+    def bump_dep!(module_name, version)
+      text = File.read(path)
+      text = replace_dependency_version(text, module_name, version)
+      File.open(path, "w") {|file| file.puts text}
+    end
+
     def replace_version(text, version)
       if @modulefile
         text.gsub(/\nversion[ ]+['"].*['"]/, "\nversion '#{version}'")
@@ -74,5 +80,23 @@ module Blacksmith
       raise Blacksmith::Error, "Unable to increase prerelease version #{version}" if v.prerelease?
       v.bump.to_s
     end
+
+    def replace_dependency_version(text, module_name, version)
+      if @modulefile
+        # example: dependency 'puppetlabs/stdlib', '>= 2.3.0'
+        module_name = module_name.sub(/^([^\/-]+)-/, '\1/')
+        text.gsub(/\ndependency[ ]+['"].*#{module_name}['"],([ ]+['"].*['"]|)/, "\ndependency '#{module_name}', '#{version}'")
+      else
+        module_name = module_name.sub(/\//, '-')
+        json = JSON.parse(text)
+        new_dep_list = []
+        json['dependencies'].each do |dep|
+          dep['version_requirement'] = version if dep['name'] == module_name
+          new_dep_list << dep
+        end
+        json['dependencies'] = new_dep_list
+        JSON.pretty_generate(json)
+      end
+    end
   end
 end

data/lib/puppet_blacksmith/rake_tasks.rb

@@ -1,44 +1,82 @@
 require 'rake'
+require 'rake/tasklib'
 require 'puppet_blacksmith'
 
-namespace :module do
-  desc "Bump module version to the next minor"
-  task :bump do
-    m = Blacksmith::Modulefile.new
-    v = m.bump!
-    puts "Bumping version from #{m.version} to #{v}"
-  end
+module Blacksmith
+  class RakeTask < ::Rake::TaskLib
 
-  desc "Git tag with the current module version"
-  task :tag do
-    m = Blacksmith::Modulefile.new
-    Blacksmith::Git.new.tag!(m.version)
-  end
+    attr_accessor :tag_pattern
 
-  desc "Bump version and git commit"
-  task :bump_commit => :bump do
-    m = Blacksmith::Modulefile.new
-    Blacksmith::Git.new.commit_modulefile!(m.version)
-  end
+    def initialize(*args, &task_block)
+      @task_name = args.shift || "blacksmith"
+      @desc = args.shift || "Puppet Forge utilities"
+      puts "INIT"
+      define(args, &task_block)
+    end
 
-  desc "Push module to the Puppet Forge"
-  task :push => :build do
-    m = Blacksmith::Modulefile.new
-    forge = Blacksmith::Forge.new
-    puts "Uploading to Puppet Forge #{forge.username}/#{m.name}"
-    forge.push!(m.name)
-  end
+    def define(args, &task_block)
 
-  desc "Runs clean again"
-  task :clean do
-    puts "Cleaning for module build"
-    Rake::Task["clean"].execute
-  end
+      task_block.call(*[self, args].slice(0, task_block.arity)) if task_block
 
-  desc "Release the Puppet module, doing a clean, build, tag, push, bump_commit and git push."
-  task :release => [:clean, :build, :tag, :push, :bump_commit] do
-    puts "Pushing to remote git repo"
-    Blacksmith::Git.new.push!
-  end
+      # clear any (auto-)pre-existing task
+      [:bump, :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"
+        task :bump do
+          m = Blacksmith::Modulefile.new
+          v = m.bump!
+          puts "Bumping version from #{m.version} to #{v}"
+        end
 
+        desc "Git tag with the current module version"
+        task :tag do
+          m = Blacksmith::Modulefile.new
+          git = Blacksmith::Git.new
+          git.tag_pattern = @tag_pattern
+          git.tag!(m.version)
+        end
+
+        desc "Bump version and git commit"
+        task :bump_commit => :bump do
+          m = Blacksmith::Modulefile.new
+          Blacksmith::Git.new.commit_modulefile!(m.version)
+        end
+
+        desc "Push module to the Puppet Forge"
+        task :push => :build do
+          m = Blacksmith::Modulefile.new
+          forge = Blacksmith::Forge.new
+          puts "Uploading to Puppet Forge #{forge.username}/#{m.name}"
+          forge.push!(m.name)
+        end
+
+        desc "Runs clean again"
+        task :clean do
+          puts "Cleaning for module build"
+          Rake::Task["clean"].execute
+        end
+
+        desc "Release the Puppet module, doing a clean, build, tag, push, bump_commit and git push."
+        task :release => [:clean, :build, :tag, :push, :bump_commit] do
+          puts "Pushing to remote git repo"
+          Blacksmith::Git.new.push!
+        end
+
+        desc "Set specific module dependency version"
+        task :dependency, [:module_name, :version] do |t, args|
+          mn = args[:module_name]
+          mv = args[:version]
+          m = Blacksmith::Modulefile.new
+          m.bump_dep! mn, mv
+          puts "Updated module dependency #{mn} to #{mv}"
+        end
+      end
+    end
+  end
 end
+
+Blacksmith::RakeTask.new

data/lib/puppet_blacksmith/version.rb

@@ -1,3 +1,3 @@
 module Blacksmith
-  VERSION = '3.0.3'
+  VERSION = '3.1.0'
 end

data/spec/data/Modulefile

@@ -6,3 +6,4 @@ project_page 'http://github.com/maestrodev/puppet-blacksmith'
 source 'http://github.com/maestrodev/puppet-blacksmith'
 summary 'Testing Puppet module operations'
 description 'Testing Puppet module operations'
+dependency 'puppetlabs/stdlib', '>= 3.0.0'

data/spec/data/metadata.json

@@ -28,5 +28,9 @@
   "description": "Standard Library for Puppet Modules",
   "project_page": "https://github.com/puppetlabs/puppetlabs-stdlib",
   "dependencies": [
+      {
+          "name": "puppetlabs-stdlib",
+          "version_requirement": ">= 3.0.0"
+      }
   ]
 }

data/spec/puppet_blacksmith/modulefile_spec.rb

@@ -49,6 +49,10 @@ describe 'Blacksmith::Modulefile' do
             "description": "Standard Library for Puppet Modules",
             "project_page": "https://github.com/puppetlabs/puppetlabs-stdlib",
             "dependencies": [
+                {
+                    "name": "puppetlabs-stdlib",
+                    "version_requirement": ">= 3.0.0"
+                }
             ]
           }
         eos
@@ -57,6 +61,52 @@ describe 'Blacksmith::Modulefile' do
       end
     end
 
+    describe 'replace_dependency_version' do
+      it "should replace the version in metadata" do
+
+        expected = <<-eos
+          {
+            "operatingsystem_support": [
+              {
+                "operatingsystem": "CentOS",
+                "operatingsystemrelease": [
+                  "4",
+                  "5",
+                  "6"
+                ]
+              }
+            ],
+            "requirements": [
+              {
+                "name": "pe",
+                "version_requirement": "3.2.x"
+              },
+              {
+                "name": "puppet",
+                "version_requirement": ">=2.7.20 <4.0.0"
+              }
+            ],
+            "name": "maestrodev-test",
+            "version": "1.0.0",
+            "source": "git://github.com/puppetlabs/puppetlabs-stdlib",
+            "author": "maestrodev",
+            "license": "Apache 2.0",
+            "summary": "Puppet Module Standard Library",
+            "description": "Standard Library for Puppet Modules",
+            "project_page": "https://github.com/puppetlabs/puppetlabs-stdlib",
+            "dependencies": [
+                {
+                    "name": "puppetlabs-stdlib",
+                    "version_requirement": ">= 4.0.0"
+                }
+            ]
+          }
+        eos
+
+        expect(JSON.parse(subject.replace_dependency_version(File.read(path), 'puppetlabs-stdlib', '>= 4.0.0'))).to eql(JSON.parse(expected))
+      end
+    end
+
   end
 
   context "using a Modulefile" do
@@ -76,12 +126,30 @@ project_page 'http://github.com/maestrodev/puppet-blacksmith'
 source 'http://github.com/maestrodev/puppet-blacksmith'
 summary 'Testing Puppet module operations'
 description 'Testing Puppet module operations'
+dependency 'puppetlabs/stdlib', '>= 3.0.0'
 eos
 
         expect(subject.replace_version(File.read(path), "1.0.1")).to eql(expected)
       end
     end
 
+    describe 'replace_dependency_version' do
+      it "should replace the dependency version in a Modulefile" do
+        expected = <<-eos
+name 'maestrodev-test'
+version '1.0.0'
+
+license 'Apache License, Version 2.0'
+project_page 'http://github.com/maestrodev/puppet-blacksmith'
+source 'http://github.com/maestrodev/puppet-blacksmith'
+summary 'Testing Puppet module operations'
+description 'Testing Puppet module operations'
+dependency 'puppetlabs/stdlib', '>= 4.0.0'
+eos
+
+        expect(subject.replace_dependency_version(File.read(path), 'puppetlabs-stdlib', '>= 4.0.0')).to eql(expected)
+      end
+    end
   end
 
   describe 'increase_version' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-blacksmith
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.0
 platform: ruby
 authors:
 - MaestroDev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -172,13 +172,13 @@ signing_key:
 specification_version: 4
 summary: Tasks to manage Puppet module builds
 test_files:
-- spec/spec_helper.rb
 - spec/data/metadata.json
 - spec/data/response.json
 - spec/data/Modulefile
 - spec/data/maestrodev-test/metadata.json
-- spec/puppet_blacksmith/forge_spec.rb
-- spec/puppet_blacksmith/forge_shared.rb
-- spec/puppet_blacksmith/forge_live_spec.rb
 - spec/puppet_blacksmith/modulefile_spec.rb
 - spec/puppet_blacksmith/git_spec.rb
+- spec/puppet_blacksmith/forge_shared.rb
+- spec/puppet_blacksmith/forge_spec.rb
+- spec/puppet_blacksmith/forge_live_spec.rb
+- spec/spec_helper.rb