puppet-blacksmith 2.1.0 → 2.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTAzNDJmZTgyMGJhYjE3MmY2ZDM1MzM0MjI0ZmYzYTBhNWM5ZjIxOQ==
+    NDliNmIwNmE5NWY3NDU3MWE0ZDhiYjQ3MDhjZjBjZWI3ZjVkNWYwOQ==
   data.tar.gz: !binary |-
-    M2RmMDlkZTljMzcwOWVlY2I5MzQ5MjJlYjEzMWE3YjAyYzAxZDkyMg==
+    YTMzNGMzZjhjYjBlMjAxMjJjNWVmMGJlMGE4ZGMyNDMyZWVlMGM4Nw==
 SHA512:
   metadata.gz: !binary |-
-    Yjc3MDI2MDNiMWQwY2RiNzcyNjgzYmE1MWExMmM2Nzg3ZDY2MWQ2NWE4MmIz
-    YmU3ZmFiYTEzNzNiMTI5OGRiNzc4MjZjMTk0MzhhZjhiOTBiN2JlOTY0MDMz
-    Mjk3MDdkZTlhZThlMzJiZWFhM2I2NDY1MjMwMTFlMTBhZWFmMjU=
+    ZDY3OTg3MzMyYjVmNWQyNWUxNjVkZjU0Njc3NzI2OGU3YTQ3ZDA3NjQ2MWIz
+    NDFiOGNhZmI0YTg4MTY4YmMyNGJkYTEyZjc4MjYzM2U5OGZkNjBhYzdlZjE4
+    ZDYyMjFkN2UxODQ3MmY2NTM1MjM0MmE2YWE3MDc2MWIzZWMxMzI=
   data.tar.gz: !binary |-
-    N2JlMTY5Y2I3YjU5Y2M0Yzg4Mzg0Nzc4YmE5Yjc1NDEwYzcxNDIxYzRiNDBk
-    YjBmNmE2Y2Y0MTQ2YWE0ZmQ3Y2ViODZmMmM1M2IwYmQyY2U0OTQ1NmQ4MmYz
-    Yzg5ODEzN2ZmNWE4NDVmM2RmM2EzZTY1YTkzZWIyNGQzNDY0NzE=
+    ZWIyYmIzZWVhZTUwY2MxYjcyNTgwZGM2NTVhMWE2YWYzMDgxM2VjYTQ2NzBl
+    ZjcxZjY3NDUxNDdhZWQ1Yjc5M2U4YWNlYmViNTMzYWNiODRhM2EzMjgzYzYx
+    NDIzZWMwMzY3ODQ1NjY2NjEwMDY4YWI5YTUyYTMxYWJhZDExYzg=

data/lib/puppet_blacksmith/modulefile.rb

@@ -17,26 +17,38 @@ Puppet[:confdir] = "."
 module Blacksmith
   class Modulefile
 
+    FILES = ["metadata.json", "Modulefile"]
+
     attr_reader :path
 
-    def initialize(path = "Modulefile")
-      @path = path
+    def initialize(path = nil)
+      @path = path.nil? ? FILES.find {|f| File.exists? f} : path
+      raise Blacksmith::Error, "Unable to find any of #{FILES}" unless @path
+      @modulefile = @path =~ /Modulefile$/
     end
 
     def metadata
       unless @metadata
-        metadata = Puppet::ModuleTool::Metadata.new
-        Puppet::ModuleTool::ModulefileReader.evaluate(metadata, path)
-        @metadata = metadata
+        if @modulefile
+          metadata = Puppet::ModuleTool::Metadata.new
+          Puppet::ModuleTool::ModulefileReader.evaluate(metadata, path)
+          @metadata = { 'name' => metadata.name, 'version' => metadata.version, 'author' => metadata.author }
+        else
+          @metadata = JSON.parse(File.read(path))
+        end
       end
       @metadata
     end
 
+    # name in metadata.json is author-modulename
     def name
-      metadata.name
+      @modulefile ? metadata['name'] : metadata['name'].split('-',2)[1]
+    end
+    def author
+      metadata['author'] || metadata['name'].split('-',2)[0]
     end
     def version
-      metadata.version
+      metadata['version']
     end
 
     def bump!
@@ -48,7 +60,13 @@ module Blacksmith
     end
 
     def replace_version(text, version)
-      text.gsub(/\nversion[ ]+['"].*['"]/, "\nversion '#{version}'")
+      if @modulefile
+        text.gsub(/\nversion[ ]+['"].*['"]/, "\nversion '#{version}'")
+      else
+        json = JSON.parse(text)
+        json['version'] = version
+        JSON.pretty_generate(json)
+      end
     end
 
     def increase_version(version)

data/lib/puppet_blacksmith/version.rb

@@ -1,3 +1,3 @@
 module Blacksmith
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

data/spec/data/metadata.json

@@ -0,0 +1,32 @@
+{
+  "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": [
+  ]
+}

data/spec/puppet_blacksmith/forge_spec.rb

@@ -13,7 +13,7 @@ describe 'Blacksmith::Forge' do
 
   describe 'missing credentials file' do
     before do
-      File.stub(:expand_path => '/home/mr_puppet/.puppetforge.yml')
+      allow(File).to receive(:expand_path) { '/home/mr_puppet/.puppetforge.yml' }
     end
 
     context "when the credentials file is missing" do

data/spec/puppet_blacksmith/git_spec.rb

@@ -10,56 +10,72 @@ describe 'Blacksmith::Git' do
     FileUtils.rm_rf path
     FileUtils.mkdir_p(path)
     `git init #{path}`
-    FileUtils.touch(File.join(path, "Modulefile"))
-    `cd #{path} && git add Modulefile && git commit -am "Init"`
   end
 
-  describe 'tag!' do
-    before { subject.tag!(version) }
-    it "should have the tag" do
-      out = `cd #{path} && git tag`
-      out.chomp.should match(/^v1.0.0$/)
+  shared_examples_for :git do
+    describe 'tag!' do
+      before { subject.tag!(version) }
+      it "should have the tag" do
+        out = `cd #{path} && git tag`
+        expect(out.chomp).to match(/^v1.0.0$/)
+      end
     end
-  end
 
-  describe 'exec_git' do
-    let(:cmd) { 'log' }
-    let(:stdin) { nil }
-    let(:stdout) { '' }
-    let(:stderr) { '' }
-    let(:exit_code) { double('exit_code', :success? => true) }
-    let(:wait_thr) { double('wait_thr', :value => exit_code) }
+    describe 'exec_git' do
+      let(:cmd) { 'log' }
+      let(:stdin) { nil }
+      let(:stdout) { '' }
+      let(:stderr) { '' }
+      let(:exit_code) { double('exit_code', :success? => true) }
+      let(:wait_thr) { double('wait_thr', :value => exit_code) }
 
-    context 'when git succeeds' do
-      before do
-        Open3.stub(:popen3).and_yield(nil, double(:read => stdout), double(:read => stderr), wait_thr)
-        expect { subject.exec_git(cmd) }.to_not raise_error
-      end
+      context 'when git succeeds' do
+        before do
+          allow(Open3).to receive(:popen3).and_yield(nil, double(:read => stdout), double(:read => stderr), wait_thr)
+          expect { subject.exec_git(cmd) }.to_not raise_error
+        end
 
-      context 'when stderr is empty' do
-        it {}
-      end
+        context 'when stderr is empty' do
+          it {}
+        end
+
+        context 'when stderr is not empty' do
+          let(:stderr) { 'some error' }
+          it {}
+        end
 
-      context 'when stderr is not empty' do
-        let(:stderr) { 'some error' }
-        it {}
       end
 
-    end
+      context 'when git fails' do
+        before { allow(subject).to receive(:git_cmd_with_path) {cmd} }
 
-    context 'when git fails' do
-      before { subject.stub(:git_cmd_with_path => cmd) }
+        # this spec fails on jruby, can't detect exit code of script
+        context 'when stderr is empty' do
+          let(:cmd) { "git" } # exits with 1
+          it { expect { subject.exec_git(cmd) }.to raise_error(Blacksmith::Error, /^Command .* failed with exit status.*1$/) }
+        end
 
-      # this spec fails on jruby, can't detect exit code of script
-      context 'when stderr is empty' do
-        let(:cmd) { "git" } # exits with 1
-        it { expect { subject.exec_git(cmd) }.to raise_error(Blacksmith::Error, /^Command .* failed with exit status.*1$/) }
+        context 'when stderr is not empty' do
+          let(:cmd) { "git help xxxx" } # exits with 1 and prints to stdout
+          it { expect { subject.exec_git(cmd) }.to raise_error(Blacksmith::Error, /No manual entry for gitxxx/) }
+        end
       end
+    end
+  end
 
-      context 'when stderr is not empty' do
-        let(:cmd) { "git help xxxx" } # exits with 1 and prints to stdout
-        it { expect { subject.exec_git(cmd) }.to raise_error(Blacksmith::Error, /No manual entry for gitxxx/) }
-      end
+  context "Using Modulefile" do
+    before do
+      FileUtils.touch(File.join(path, "Modulefile"))
+      `cd #{path} && git add Modulefile && git commit -am "Init"`
+    end
+    it_behaves_like :git
+  end
+
+  context "Using metadata.json" do
+    before do
+      FileUtils.touch(File.join(path, "metadata.json"))
+      `cd #{path} && git add metadata.json && git commit -am "Init"`
     end
+    it_behaves_like :git
   end
 end

data/spec/puppet_blacksmith/modulefile_spec.rb

@@ -2,50 +2,92 @@ require 'spec_helper'
 
 describe 'Blacksmith::Modulefile' do
 
+  let(:path) { "spec/data/metadata.json" }
+
   subject { Blacksmith::Modulefile.new(path) }
-  let(:path) { "spec/data/Modulefile" }
 
-  context 'when modulefile is parsed' do
-    it { subject.metadata.version.should eql("1.0.0") }
-    it { subject.metadata.author.should eql("maestrodev") }
-    it { subject.metadata.name.should eql("test") }
+  shared_examples_for :metadata do
+    it { expect(subject.version).to eql("1.0.0") }
+    it { expect(subject.name).to eql("test") }
   end
 
-  describe 'replace_version' do
-    it "should replace the version" do
-      original = <<-eos
-name 'maestrodev-test'
-version '1.0.0'
+  context "using metadata.json" do
 
-author 'maestrodev'
-license 'Apache License, Version 2.0'
-project_page 'http://github.com/maestrodev/puppet-blacksmith'
-source 'http://github.com/maestrodev/puppet-blacksmith'
-summary 'version "1"'
-description "version '1'"
-eos
+    it_behaves_like :metadata
+
+    describe 'replace_version' do
+      it "should replace the version in metadata" do
 
-      expected = <<-eos
+        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.1",
+            "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": [
+            ]
+          }
+        eos
+
+        expect(JSON.parse(subject.replace_version(File.read(path), "1.0.1"))).to eql(JSON.parse(expected))
+      end
+    end
+
+  end
+
+  context "using a Modulefile" do
+
+    let(:path) { "spec/data/Modulefile" }
+
+    it_behaves_like :metadata
+
+    describe 'replace_version' do
+      it "should replace the version in a Modulefile" do
+        expected = <<-eos
 name 'maestrodev-test'
 version '1.0.1'
 
-author 'maestrodev'
 license 'Apache License, Version 2.0'
 project_page 'http://github.com/maestrodev/puppet-blacksmith'
 source 'http://github.com/maestrodev/puppet-blacksmith'
-summary 'version "1"'
-description "version '1'"
+summary 'Testing Puppet module operations'
+description 'Testing Puppet module operations'
 eos
 
-      subject.replace_version(original, "1.0.1").should eql(expected)
+        expect(subject.replace_version(File.read(path), "1.0.1")).to eql(expected)
+      end
     end
+
   end
 
   describe 'increase_version' do
-    it { subject.increase_version("1.0").should eql("1.1") }
-    it { subject.increase_version("1.0.0").should eql("1.0.1") }
-    it { subject.increase_version("1.0.1").should eql("1.0.2") }
+    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.12qwe") }.to raise_error }
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-blacksmith
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - MaestroDev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -154,6 +154,7 @@ files:
 - spec/data/Modulefile
 - spec/data/forge_error.html
 - spec/data/maestrodev-ant-1.0.4.tar.gz
+- spec/data/metadata.json
 - spec/puppet_blacksmith/forge_spec.rb
 - spec/puppet_blacksmith/git_spec.rb
 - spec/puppet_blacksmith/modulefile_spec.rb
@@ -182,10 +183,11 @@ signing_key:
 specification_version: 4
 summary: Tasks to manage Puppet module builds
 test_files:
-- spec/spec_helper.rb
 - spec/data/maestrodev-ant-1.0.4.tar.gz
+- spec/data/metadata.json
 - spec/data/forge_error.html
 - spec/data/Modulefile
 - spec/puppet_blacksmith/forge_spec.rb
 - spec/puppet_blacksmith/modulefile_spec.rb
 - spec/puppet_blacksmith/git_spec.rb
+- spec/spec_helper.rb