puppet-blacksmith 3.0.1 → 3.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTY2Yzc5NzNiM2E0ZjI3ZTk2ZjVjMjViOThhYTM4NDM1Yjg3YTRmZQ==
+    YzQxNDUxMzM4OGFmNmUyZTg5YjIzNjA1MDM5ZmJkZTYyYTgzNjIwMA==
   data.tar.gz: !binary |-
-    ZTZmZjhiZDdmMDE2N2E0MDY5NWU0MjlkN2YwMDk4ZGMyNGQ2ZTk5Nw==
+    OWNjODg5OGY5MTI1YTI1YjY1NzRjNDZiZDJkNjZiNGI2Y2Q5NTNjMA==
 SHA512:
   metadata.gz: !binary |-
-    YmY4NjZjNzQ1MjY1ZDA4MDQ3YWVjZjhlNjVmMjYwZTM0ZGExYTM5NjEwNDNk
-    MDBmMDJiMWU0ZTJhNmNkN2Q2MjkwMjMzY2UzNTQ0ZTQ1NjVmODBkYWZkZjVl
-    ZWFhMGQ1NTZkYmY4N2MxY2EyMzYxN2EyMjJmYWE4NjI5ZWVhMDY=
+    ZjBlMjZkYmVkYjdhZGVkYTFmNzIwODY2OTdmZmQwZTc1NzIyY2M1NWMyMjE1
+    ZjFiMTU2N2E5NmQyM2M1ZDFmNjdkM2Y1YTY5MDM4YjMxNzE2YmI2NzE3M2Zi
+    NWEwN2YyYjJiYjc4MDE1NWUwOGNiY2ZjZDdiYTY4ZjNhMjQ3MTM=
   data.tar.gz: !binary |-
-    MmVkNzIyMmJhZjMzOTk5YjZlMGE4YWY5OGFhODgzYzVhNDk4NzM1YTcxN2Jk
-    MzkyY2UxOTQzMmZhYjdiNDA5NWJkNjUyYTdkOGQ2YmFiY2M5NmVlNzgxNjEw
-    ZDAxNjQ5OTAwZTRkYWZjMTQ1NGQxOWQ2ZWEyYTEzYmY5MzQwNzM=
+    MDVjZDU2NTIyODM0MjMwZDFmNzI5ODg4ZWYxNGQ2YTgzMjU0ZTc1MDlmYTg0
+    MDRlY2E4ZTUzZjEyZjMwZGU2MTk3Y2UwYTJiYzI5NTE4Nzc0Mzg2Yzc4Y2Y3
+    NTNlMDlhOGI5NjFiNzJjMWFiYTU3Zjg2NzY3ZTYwYmRlOTNmMDA=

data/lib/puppet_blacksmith/forge.rb

@@ -37,20 +37,28 @@ module Blacksmith
       raise Errno::ENOENT, "File does not exist: #{package}" unless File.exists?(package)
 
       # login to the puppet forge
-      response = RestClient.post("#{url}/oauth/token", {
-        'client_id' => client_id,
-        'client_secret' => client_secret,
-        'username' => username,
-        'password' => password,
-        'grant_type' => 'password'
-      }, HEADERS)
+      begin
+        response = RestClient.post("#{url}/oauth/token", {
+          'client_id' => client_id,
+          'client_secret' => client_secret,
+          'username' => username,
+          'password' => password,
+          'grant_type' => 'password'
+        }, HEADERS)
+      rescue RestClient::Exception => e
+        raise Blacksmith::Error, "Error login to the forge #{url} as #{username} [#{e.message}]: #{e.response}"
+      end
       login_data = JSON.parse(response)
       access_token = login_data['access_token']
 
       # upload the file
-      response = RestClient.post("#{url}/v2/releases",
-        {:file => File.new(package, 'rb')},
-        HEADERS.merge({'Authorization' => "Bearer #{access_token}"}))
+      begin
+        response = RestClient.post("#{url}/v2/releases",
+          {:file => File.new(package, 'rb')},
+          HEADERS.merge({'Authorization' => "Bearer #{access_token}"}))
+      rescue RestClient::Exception => e
+        raise Blacksmith::Error, "Error uploading #{package} to the forge #{url} [#{e.message}]: #{e.response}"
+      end
     end
 
     private
@@ -62,7 +70,7 @@ module Blacksmith
 Could not find Puppet Forge credentials file '#{credentials_file}'
 Please create it
 ---
-url: https://forge.puppetlabs.com
+url: https://forgeapi.puppetlabs.com
 username: myuser
 password: mypassword
     eos

data/lib/puppet_blacksmith/version.rb

@@ -1,3 +1,3 @@
 module Blacksmith
-  VERSION = '3.0.1'
+  VERSION = '3.0.2'
 end

data/spec/puppet_blacksmith/forge_live_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+require_relative 'forge_shared'
+require 'fileutils'
+
+# Run tests against the real Forge staging API
+describe 'Blacksmith::Forge', :live => true do
+  include_context 'forge'
+  let(:username) { nil }
+
+  describe 'push' do
+    before { create_tarball }
+    include_examples 'forge_push'
+  end
+end

data/spec/puppet_blacksmith/forge_shared.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+require 'fileutils'
+
+RSpec.shared_examples 'forge_push' do |collection_class|
+  it "should push the module" do
+    subject.push!(module_name, package)
+  end
+end
+
+RSpec.shared_context "forge" do
+  subject { Blacksmith::Forge.new(username, password, forge) }
+  let(:username) { 'johndoe' }
+  let(:password) { 'secret' }
+  let(:forge) { "https://forgestagingapi.puppetlabs.com" }
+  let(:module_name) { "test" }
+  let(:version) { "1.0.0" }
+  let(:module_name) { "maestrodev-test" }
+  let(:spec_data) { File.join(File.dirname(__FILE__), '/../data') }
+  let(:spec_module) { File.join(spec_data, module_name) }
+  let(:target) { File.expand_path(File.join(__FILE__, "../../..", "pkg", module_name)) }
+  let(:package) { "#{target}.tar.gz" }
+
+  let(:headers) { { 'User-Agent' => %r{^Blacksmith/#{Blacksmith::VERSION} Ruby/.* \(.*\)$} } }
+
+  def create_tarball
+    FileUtils.mkdir_p(target)
+
+    # update version
+    f = File.join(spec_module, "metadata.json")
+    metadata = JSON.parse File.read(f)
+    metadata['version'] = "1.0.#{Random.rand(9999999)}"
+    File.open(File.join(target, "metadata.json"),"w") do |file|
+      file.write(JSON.pretty_generate(metadata))
+    end
+    `cd #{target}/..; tar -czf #{module_name}.tar.gz #{module_name}`
+  end
+end

data/spec/puppet_blacksmith/forge_spec.rb

@@ -1,20 +1,10 @@
 require 'spec_helper'
+require_relative 'forge_shared'
 require 'fileutils'
 require 'webmock/rspec'
 
 describe 'Blacksmith::Forge' do
-
-  subject { Blacksmith::Forge.new(username, password, forge) }
-  let(:username) { 'johndoe' }
-  let(:password) { 'secret' }
-  let(:forge) { "https://forgestagingapi.puppetlabs.com" }
-  let(:module_name) { "test" }
-  let(:version) { "1.0.0" }
-  let(:module_name) { "maestrodev-test" }
-  let(:spec_data) { File.join(File.dirname(__FILE__), '/../data') }
-  let(:spec_module) { File.join(spec_data, module_name) }
-  let(:target) { File.expand_path(File.join(__FILE__, "../../..", "pkg", module_name)) }
-  let(:package) { "#{target}.tar.gz" }
+  include_context 'forge'
 
   describe 'missing credentials file' do
     before do
@@ -27,39 +17,27 @@ describe 'Blacksmith::Forge' do
       end
 
       it "should raise an error" do
-        expect { foo = Blacksmith::Forge.new(nil, password, forge) }.to raise_error(/Could not find Puppet Forge credentials file '\/home\/mr\_puppet\/.puppetforge.yml'\s*Please create it\s*---\s*url: https:\/\/forge.puppetlabs.com\s*username: myuser\s*password: mypassword/)
+        expect { foo = Blacksmith::Forge.new(nil, password, forge) }.to raise_error(/Could not find Puppet Forge credentials file '\/home\/mr\_puppet\/.puppetforge.yml'\s*Please create it\s*---\s*url: https:\/\/forgeapi.puppetlabs.com\s*username: myuser\s*password: mypassword/)
       end
     end
 
   end
 
-  describe 'push', :credentials => true do
-    let(:headers) { { 'User-Agent' => %r{^Blacksmith/#{Blacksmith::VERSION} Ruby/.* \(.*\)$} } }
+  describe 'push' do
+    let(:login_body) {{
+      "client_id"=>"b93eb708fd942cfc7b4ed71db6ce219b814954619dbe537ddfd208584e8cff8d",
+      "client_secret"=>"216648059ad4afec3e4d77bd9e67817c095b2dcf94cdec18ac3d00584f863180",
+      "grant_type"=>"password",
+      "password"=>"secret",
+      "username"=>"johndoe"
+    }}
 
-    before do
-      FileUtils.mkdir_p(target)
-
-      # update version
-      f = File.join(spec_module, "metadata.json")
-      metadata = JSON.parse File.read(f)
-      metadata['version'] = "1.0.#{Random.rand(9999999)}"
-      File.open(File.join(target, "metadata.json"),"w") do |file|
-        file.write(JSON.pretty_generate(metadata))
-      end
-      `cd #{target}/..; tar -czf #{module_name}.tar.gz #{module_name}`
-    end
+    before { create_tarball }
 
     context "when using username and password" do
       before do
-
         stub_request(:post, "#{forge}/oauth/token").with(
-            :body => {
-              "client_id"=>"b93eb708fd942cfc7b4ed71db6ce219b814954619dbe537ddfd208584e8cff8d",
-              "client_secret"=>"216648059ad4afec3e4d77bd9e67817c095b2dcf94cdec18ac3d00584f863180",
-              "grant_type"=>"password",
-              "password"=>"secret",
-              "username"=>"johndoe"
-            },
+            :body => login_body,
             :headers => headers
           ).to_return(
             :status => 200,
@@ -71,14 +49,27 @@ describe 'Blacksmith::Forge' do
             :headers => headers.merge({'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'Authorization'=>'Bearer e52f78b62e97cb8d8db6659a73aa522cca0f5c74d4714e0ed0bdd10000000000', 'Content-Type'=>%r{multipart/form-data;}})
           ).to_return(:status => 200, :body => File.read(File.join(spec_data, "response.json")), :headers => {})
 
-        subject.push!(module_name, package)
       end
 
-      it "should push the module" do
+      include_examples 'forge_push'
+    end
 
+    context "when using bad credentials" do
+      before do
+        stub_request(:post, "#{forge}/oauth/token").with(
+            :body => login_body,
+            :headers => headers
+          ).to_return(
+            :status => 400,
+            :body => {"error"=>"invalid_grant","error_description"=>"Username/password do not match"}.to_json,
+            :headers => {})
       end
-    end
 
+      it "should push the module" do
+        expect { subject.push!(module_name, package) }.to raise_error(Blacksmith::Error, "Error login to the forge #{forge} as #{username} [400 Bad Request]: {\"error\":\"invalid_grant\",\"error_description\":\"Username/password do not match\"}")
+      end
+
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-blacksmith
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - MaestroDev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -142,6 +142,8 @@ files:
 - spec/data/maestrodev-test/metadata.json
 - spec/data/metadata.json
 - 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/git_spec.rb
 - spec/puppet_blacksmith/modulefile_spec.rb
@@ -176,5 +178,7 @@ test_files:
 - 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