librarian 0.0.24 → 0.0.25

data/.travis.yml

@@ -1,6 +1,12 @@
 language: ruby
+script: rspec spec
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - rbx
+  - rbx-18mode
+  - rbx-19mode
+matrix:
+  allow_failures:
+    - rvm: rbx-18mode
+    - rvm: rbx-19mode

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Change Log
 
+## 0.0.25
+
+* \#71. Fix an error, given certain locale settings, with reading cookbook
+  metadata files.
+
+* \#89. Fix an error when encountering manifests and dependencies with names of
+  a single letter, such as `"R"`.
+
+* \#92, \#99. HTTP proxy support via the `HTTP_PROXY` environment variable. Also
+  supports `HTTP_PROXY_USER` and `HTTP_PROXY_PASS` environment variables. Thanks
+  @tknerr.
+
+* \#97. Enforce that the `:ref` option in the `:git` source may only be given a
+  string.
+
+* \#98. Fix unpacking chef site-sourced packages where the directory in the
+  tarball does not match the cookbook name.
+
 ## 0.0.24
 
 * \#15. A remembered configuration system.
@@ -12,7 +30,7 @@
 * \#76. Support git annotated tags.
 
 * \#80. Ignore directories in the `PATH` named `git` when looking for the `git`
-  bin.
+  bin. Thanks @avit.
 
 * \#85. Provide a helpful message when running the `show` command without a
   lockfile present.

data/README.md

@@ -146,8 +146,8 @@ Prepare your infrastructure repository:
 
     $ cd ~/path/to/chef-repo
     $ git rm -r cookbooks
-    $ echo cookbooks >> .gitignore
-    $ echo tmp >> .gitignore
+    $ echo /cookbooks >> .gitignore
+    $ echo /tmp >> .gitignore
 
 Librarian-Chef takes over your `cookbooks/` directory, and will always reinstall
 the cookbooks listed the `Cheffile.lock` into your `cookbooks/` directory. Hence
@@ -359,12 +359,7 @@ How to Contribute
 
 ### Running the tests
 
-    # Either
     $ rspec spec
-    $ cucumber
-
-    # Or
-    $ rake
 
 You will probably need some way to isolate gems. Librarian provides a `Gemfile`,
 so if you want to use bundler, you can prepare the directory with the usual
@@ -372,8 +367,6 @@ so if you want to use bundler, you can prepare the directory with the usual
 
     $ bundle install
     $ bundle exec rspec spec
-    $ bundle exec cucumber
-    $ bundle exec rake
 
 ### Installing locally
 

data/Rakefile

@@ -21,14 +21,3 @@ module Bundler
 end
 
 Bundler::GemHelper.install_tasks
-
-begin
-  require 'rspec/core/rake_task'
-  RSpec::Core::RakeTask.new(:spec)
-
-  require 'cucumber/rake/task'
-  Cucumber::Rake::Task.new(:features)
-
-  task :default => [:spec, :features]
-rescue LoadError
-end

data/lib/librarian.rb

@@ -8,12 +8,4 @@ module Librarian
     self::Environment
   end
 
-  def environment
-    @environment ||= environment_class.new
-  end
-
-  def version
-    VERSION
-  end
-
 end

data/lib/librarian/action/base.rb

@@ -1,11 +1,7 @@
-require "librarian/helpers/debug"
-
 module Librarian
   module Action
     class Base
 
-      include Helpers::Debug
-
       attr_accessor :environment
       private :environment=
 
@@ -17,6 +13,12 @@ module Librarian
         self.options = options
       end
 
+    private
+
+      def debug(*args, &block)
+        environment.logger.debug(*args, &block)
+      end
+
     end
   end
 end

data/lib/librarian/chef/cli.rb

@@ -13,7 +13,6 @@ module Librarian
         end
       end
 
-      include Particularity
       extend Particularity
 
       source_root Pathname.new(__FILE__).dirname.join("templates")
@@ -23,6 +22,7 @@ module Librarian
       end
 
       desc "install", "Resolves and installs all of the dependencies you specify."
+      option "quiet", :type => :boolean, :default => false
       option "verbose", :type => :boolean, :default => false
       option "line-numbers", :type => :boolean, :default => false
       option "clean", :type => :boolean, :default => false

data/lib/librarian/chef/integration/knife.rb

@@ -24,6 +24,10 @@ module Librarian
       end
     end
 
+    def environment
+      @environment ||= environment_class.new
+    end
+
     def install_path
       environment.install_path
     end

data/lib/librarian/chef/manifest_reader.rb

@@ -16,8 +16,8 @@ module Librarian
 
       def read_manifest(name, manifest_path)
         case manifest_path.extname
-        when ".json" then JSON.parse(manifest_path.read)
-        when ".yml", ".yaml" then YAML.load(manifest_path.read)
+        when ".json" then JSON.parse(binread(manifest_path))
+        when ".yml", ".yaml" then YAML.load(binread(manifest_path))
         when ".rb" then compile_manifest(name, manifest_path.dirname)
         end
       end
@@ -42,6 +42,18 @@ module Librarian
         manifest["name"] == name
       end
 
+    private
+
+      if IO.respond_to?(:binread)
+        def binread(path)
+          path.binread
+        end
+      else
+        def binread(path)
+          path.read
+        end
+      end
+
     end
   end
 end

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

@@ -8,6 +8,8 @@ module Librarian
         def install!(manifest)
           manifest.source == self or raise ArgumentError
 
+          info { "Installing #{manifest.name} (#{manifest.version})" }
+
           debug { "Installing #{manifest}" }
 
           name, version = manifest.name, manifest.version

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

@@ -8,8 +8,6 @@ require 'zlib'
 require 'securerandom'
 require 'archive/tar/minitar'
 
-require 'librarian/helpers/debug'
-
 require 'librarian/chef/manifest_reader'
 
 module Librarian
@@ -17,12 +15,8 @@ module Librarian
     module Source
       class Site
 
-        include Helpers::Debug
-
         class Line
 
-          include Helpers::Debug
-
           attr_accessor :source, :name
           private :source=, :name=
 
@@ -238,39 +232,27 @@ module Librarian
           end
 
           def cache_remote_json!(path, uri)
-            path = Pathname(path)
-            uri = to_uri(uri)
-
-            path.dirname.mkpath unless path.dirname.directory?
-
-            debug { "Caching #{uri} to #{path}" }
-
-            http = Net::HTTP.new(uri.host, uri.port)
-            request = Net::HTTP::Get.new(uri.path)
-            response = http.start{|http| http.request(request)}
-            unless Net::HTTPSuccess === response
-              raise Error, "Could not get #{uri} because #{response.code} #{response.message}!"
-            end
-            json = response.body
-            JSON.parse(json) # verify that it's really JSON.
-            write! path, json
+            cache_remote_object!(path, uri, :type => :json)
           end
 
-          def cache_remote_object!(path, uri)
+          def cache_remote_object!(path, uri, options = { })
             path = Pathname(path)
             uri = to_uri(uri)
-
-            path.dirname.mkpath unless path.dirname.directory?
+            type = options[:type]
 
             debug { "Caching #{uri} to #{path}" }
 
-            http = Net::HTTP.new(uri.host, uri.port)
-            request = Net::HTTP::Get.new(uri.path)
-            response = http.start{|http| http.request(request)}
+            response = http_get(uri)
             unless Net::HTTPSuccess === response
               raise Error, "Could not get #{uri} because #{response.code} #{response.message}!"
             end
-            write! path, response.body
+
+            object = response.body
+            case type
+            when :json
+              JSON.parse(object) # verify that it's really JSON.
+            end
+            write! path, object
           end
 
           def write!(path, bytes)
@@ -291,9 +273,11 @@ module Librarian
             end
 
             # Cookbook files, as pulled from Opscode Community Site API, are
-            # embedded in a subdirectory of the tarball, and the subdirectory's
-            # name is equal to the name of the cookbook.
-            subtemp = temp.join(name)
+            # embedded in a subdirectory of the tarball.
+            subtemps = temp.children
+            subtemps.empty? and raise "The package archive was empty!"
+            subtemps.size > 1 and raise "The package archive has too many children!"
+            subtemp = subtemps.first
             debug { "Moving #{relative_path_to(subtemp)} to #{relative_path_to(path)}" }
             FileUtils.mv(subtemp, path)
           ensure
@@ -313,6 +297,26 @@ module Librarian
             uri
           end
 
+          def debug(*args, &block)
+            environment.logger.debug(*args, &block)
+          end
+
+          def relative_path_to(path)
+            environment.logger.relative_path_to(path)
+          end
+
+          def http(uri)
+            environment.net_http_class.new(uri.host, uri.port)
+          end
+
+          def http_get(uri)
+            http = http(uri)
+            request = Net::HTTP::Get.new(uri.path)
+            response = http.start{|http| http.request(request)}
+
+            response
+          end
+
         end
 
         class << self
@@ -337,18 +341,12 @@ module Librarian
 
         end
 
-        attr_accessor :environment
-        private :environment=
-        attr_reader :uri
-
-        attr_accessor :_metadata_cache
-        private :_metadata_cache, :_metadata_cache=
+        attr_accessor :environment, :uri
+        private :environment=, :uri=
 
         def initialize(environment, uri, options = {})
           self.environment = environment
-          @uri = uri
-          @cache_path = nil
-          self._metadata_cache = { }
+          self.uri = uri
         end
 
         def to_s
@@ -384,6 +382,8 @@ module Librarian
           install_path = install_path(name)
           line = line(name)
 
+          info { "Installing #{manifest.name} (#{manifest.version})" }
+
           debug { "Installing #{manifest}" }
 
           line.install_version! version, install_path
@@ -428,6 +428,14 @@ module Librarian
           @line[name] ||= Line.new(self, name)
         end
 
+        def info(*args, &block)
+          environment.logger.info(*args, &block)
+        end
+
+        def debug(*args, &block)
+          environment.logger.debug(*args, &block)
+        end
+
       end
     end
   end

data/lib/librarian/cli.rb

@@ -6,8 +6,6 @@ require 'librarian/error'
 require 'librarian/action'
 require "librarian/ui"
 
-require "librarian/helpers/debug"
-
 module Librarian
   class Cli < Thor
 
@@ -21,31 +19,40 @@ module Librarian
       end
     end
 
-    include Particularity
     extend Particularity
 
-    include Helpers::Debug
-
     class << self
       def bin!
-        begin
-          environment = root_module.environment
-          start
-        rescue Librarian::Error => e
-          environment.ui.error e.message
-          environment.ui.debug e.backtrace.join("\n")
-          exit (e.respond_to?(:status_code) ? e.status_code : 1)
-        rescue Interrupt => e
-          environment.ui.error "\nQuitting..."
-          exit 1
+        with_environment do |environment|
+          begin
+            start
+          rescue Librarian::Error => e
+            environment.ui.error e.message
+            environment.ui.debug e.backtrace.join("\n")
+            exit (e.respond_to?(:status_code) ? e.status_code : 1)
+          rescue Interrupt => e
+            environment.ui.error "\nQuitting..."
+            exit 1
+          end
         end
       end
+
+      attr_accessor :environment
+
+      def with_environment
+        environment = root_module.environment_class.new
+        self.environment, orig_environment = environment, self.environment
+        yield(environment)
+      ensure
+        self.environment = orig_environment
+      end
     end
 
     def initialize(*)
       super
       the_shell = (options["no-color"] ? Thor::Shell::Basic.new : shell)
       environment.ui = UI::Shell.new(the_shell)
+      environment.ui.be_quiet! if options["quiet"]
       environment.ui.debug! if options["verbose"]
       environment.ui.debug_line_numbers! if options["verbose"] && options["line-numbers"]
 
@@ -54,7 +61,7 @@ module Librarian
 
     desc "version", "Displays the version."
     def version
-      say "librarian-#{root_module.version}"
+      say "librarian-#{environment.version}"
     end
 
     desc "config", "Show or edit the config."
@@ -145,7 +152,7 @@ module Librarian
   private
 
     def environment
-      root_module.environment
+      self.class.environment
     end
 
     def ensure!(options = { })
@@ -196,5 +203,13 @@ module Librarian
       end
     end
 
+    def debug(*args, &block)
+      environment.logger.debug(*args, &block)
+    end
+
+    def relative_path_to(path)
+      environment.logger.relative_path_to(path)
+    end
+
   end
 end