librarian-chef 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 950187ce3da19669233c3f801545c4ed7f090bd7
-  data.tar.gz: d342abdad8f21e4deaec5c85207bb4462de51366
+  metadata.gz: b59a3da03ffcb2136feeecb521cc12df1421f171
+  data.tar.gz: d8eb2efdb1bc0883f25724056d6842a3374bd22a
 SHA512:
-  metadata.gz: 82af4d4079d644156065ed2747fb23686fda4678f15711e355abd3558389737d5a56618fee67018c16de67762cfe0191336f2a13ddb68f1585d95b0544bd4344
-  data.tar.gz: 990d08487fcd2a6d1afa919f951917041022acd284feaf17ddee534520304acdb717d97c85250a48a790c58df0378a76dcd7b57dc0f80dc7ee1d3fda3c6e019c
+  metadata.gz: 43754256753f5c95abdcd22e452d90fcc5c0125f7006f7a897721f52c9e04d0b02658172e4984730f400e0ae6410469a9c525eb59eb9a818c26041f4a9478e35
+  data.tar.gz: 10b75a52059ff714d2cc6e5100c4fceeb69baedbb298576027679e6736a5408369d081527638aae12e5e184f34aeca5dcd9149548d030aa8253a260a43e10e27

data/.travis.yml

@@ -5,8 +5,7 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - rbx-18mode
-  - rbx-19mode
+  - rbx
   - jruby-18mode
   - jruby-19mode
   - ruby-head

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 0.0.3
+
+* Support HTTPS endpoints. Thanks @sl4m.
+* Support cookbooks with long paths.
+
 ## 0.0.2
 
 * Support tar cookbook archives in addition to targz cookbook archives.

data/lib/librarian/chef/source/site.rb

@@ -336,7 +336,9 @@ module Librarian
           end
 
           def http(uri)
-            environment.net_http_class(uri.host).new(uri.host, uri.port)
+            net_http = environment.net_http_class(uri.host).new(uri.host, uri.port)
+            net_http.use_ssl = true if uri.scheme == 'https'
+            net_http
           end
 
           def http_get(uri)

data/lib/librarian/chef/version.rb

@@ -1,5 +1,5 @@
 module Librarian
   module Chef
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/librarian-chef.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "librarian", "~> 0.1.0"
   gem.add_dependency "chef", ">= 0.10"
-  gem.add_dependency "archive-tar-minitar", ">= 0.5.2"
+  gem.add_dependency "minitar", ">= 0.5.2"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"

data/spec/functional/chef/source/site_spec.rb

@@ -291,6 +291,61 @@ module Librarian
           end
         end
 
+        describe "https api endpoint" do
+          let(:https_api_url) { "https://site.cookbooks.com" }
+          let(:source) { described_class.new(env, https_api_url) }
+
+          let(:sample_metadata) do
+            Helpers.strip_heredoc(<<-METADATA)
+              version "0.6.5"
+            METADATA
+          end
+
+          let(:sample_index_data) do
+            {
+              "name" => "sample",
+              "versions" => [
+                "#{https_api_url}/cookbooks/sample/versions/0_6_5"
+              ]
+            }
+          end
+
+          let(:sample_0_6_5_data) do
+            {
+              "version" => "0.6.5",
+              "file" => "#{https_api_url}/cookbooks/sample/versions/0_6_5/file.tar.gz"
+            }
+          end
+
+          let(:sample_0_6_5_package) do
+            s = StringIO.new
+            z = Zlib::GzipWriter.new(s, Zlib::NO_COMPRESSION)
+            t = Archive::Tar::Minitar::Output.new(z)
+            t.tar.add_file_simple("sample/metadata.rb", :mode => 0700,
+              :size => sample_metadata.bytesize){|io| io.write(sample_metadata)}
+            t.close
+            z.close unless z.closed?
+            s.string
+          end
+
+          def stub_sample_cookbook_requests
+            stub_request(:get, "#{https_api_url}/cookbooks/sample").
+              to_return(:body => JSON.dump(sample_index_data))
+
+            stub_request(:get, "#{https_api_url}/cookbooks/sample/versions/0_6_5").
+              to_return(:body => JSON.dump(sample_0_6_5_data))
+
+            stub_request(:get, "#{https_api_url}/cookbooks/sample/versions/0_6_5/file.tar.gz").
+              to_return(:body => sample_0_6_5_package)
+          end
+
+          it 'handles https api endpoints' do
+            stub_sample_cookbook_requests
+            manifest = source.manifests("sample").first
+            manifest.version.to_s.should == "0.6.5"
+          end
+        end
+
         describe "extracting .tar packages" do
           let(:source) { described_class.new(env, api_url) }
 
@@ -344,6 +399,65 @@ module Librarian
 
         end
 
+        describe "extracting .tar packages with long filenames" do
+          let(:source) { described_class.new(env, api_url) }
+
+          before { tmp_path.mkpath unless tmp_path.exist? }
+          let(:bad_name_size) { Librarian::Posix.run!(%W[getconf NAME_MAX #{tmp_path}]).to_i }
+          let(:bad_name_path) { SecureRandom.hex((bad_name_size.to_f/2).ceil)[0...bad_name_size] }
+
+          before { expect(bad_name_path.size).to eq bad_name_size }
+
+          let(:sample_metadata) do
+            Helpers.strip_heredoc(<<-METADATA)
+              version "0.6.5"
+            METADATA
+          end
+
+          let(:sample_index_data) do
+            {
+              "name" => "sample",
+              "versions" => [
+                "#{api_url}/cookbooks/sample/versions/0_6_5"
+              ]
+            }
+          end
+          let(:sample_0_6_5_data) do
+            {
+              "version" => "0.6.5",
+              "file" => "#{api_url}/cookbooks/sample/versions/0_6_5/file.tar"
+            }
+          end
+          let(:sample_0_6_5_package) do
+            tar_path = tmp_path + "tar-source"
+            tar_path.mkpath
+            tar_path.join("sample").mkpath
+            tar_path.join("sample/metadata.rb").open("w"){|io| io.write(sample_metadata)}
+            tar_path.join("sample/#{bad_name_path}").open("w"){|io| io.write("?")}
+            Librarian::Posix.run!(%W[tar cz -C #{tar_path} . ])
+          end
+
+          before do
+            stub_request(:get, "#{api_url}/cookbooks/sample").
+              to_return(:body => JSON.dump(sample_index_data))
+
+            stub_request(:get, "#{api_url}/cookbooks/sample/versions/0_6_5").
+              to_return(:body => JSON.dump(sample_0_6_5_data))
+
+            stub_request(:get, "#{api_url}/cookbooks/sample/versions/0_6_5/file.tar").
+              to_return(:body => sample_0_6_5_package)
+          end
+
+          it "installs the manifest" do
+            env.install_path.mkpath
+            manifest = source.manifests("sample").first
+            source.install!(manifest)
+            text = env.install_path.join("sample/#{bad_name_path}").read
+            text.should == "?"
+          end
+
+        end
+
       end
     end
   end

data/spec/integration/chef/source/git_spec.rb

@@ -362,8 +362,8 @@ module Librarian
               version "0.6.5"
             METADATA
           end
-          before do
 
+          before do
             # set up the git repo as normal, but let's also set up a release-stable branch
             # from which our Cheffile will only pull stable releases
             git_path.rmtree if git_path.exist?

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: librarian-chef
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jay Feldblum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-18 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarian
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: archive-tar-minitar
+  name: minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.2
 - !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: rspec
   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: 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: A Bundler for your Chef Cookbooks.
@@ -102,9 +102,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -143,17 +143,17 @@ 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.1.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Bundler for your Chef Cookbooks.