berkshelf 1.4.5 → 1.4.6

data/lib/berkshelf/community_rest.rb

@@ -17,6 +17,8 @@ module Berkshelf
           Archive::Tar::Minitar.unpack(Zlib::GzipReader.new(File.open(target, 'rb')), destination)
         elsif is_tar_file(target)
           Archive::Tar::Minitar.unpack(target, destination)
+        else
+          raise Berkshelf::UnknownCompressionType.new(target)
         end
         destination
       end
@@ -43,7 +45,7 @@ module Berkshelf
         end
 
         def is_tar_file(path)
-          IO.binread(path, 8, 257) == "ustar  \0"
+          IO.binread(path, 8, 257).to_s == "ustar\x0000"
         end
     end
 

data/lib/berkshelf/errors.rb

@@ -163,4 +163,92 @@ module Berkshelf
       "Unknown site shortname: #{@shortname.inspect}. Supported shortnames are: #{SiteLocation::SHORTNAMES.keys.map(&:inspect).join(',')}"
     end
   end
+
+  class OutdatedCookbookSource < BerkshelfError
+    status_code(128)
+
+    # @return [Berkshelf::CookbookSource]
+    attr_reader :locked_source, :source
+
+    # @param [Berkshelf::CookbookSource] source
+    #   the cookbook source that is outdated
+    def initialize(locked_source, source)
+      @locked_source = locked_source
+      @source = source
+    end
+
+    def to_s
+      [
+        "Berkshelf could not find compatible versions for cookbook '#{source.name}':",
+        "  In Berksfile:",
+        "    #{locked_source.name} (#{locked_source.locked_version})",
+        "",
+        "  In Berksfile.lock:",
+        "    #{source.name} (#{source.version_constraint})",
+        "",
+        "Try running `berks update #{source.name}, which will try to find  '#{source.name}' matching '#{source.version_constraint}'."
+      ].join("\n")
+    end
+  end
+
+  class EnvironmentNotFound < BerkshelfError
+    status_code(129)
+
+    def initialize(environment_name)
+      @environment_name = environment_name
+    end
+
+    def to_s
+      %Q[The environment "#{@environment_name}" does not exist.]
+    end
+  end
+
+  class ChefConnectionError < BerkshelfError
+    status_code(130)
+
+    def to_s
+      "There was an error connecting to the chef server."
+    end
+  end
+
+  # @author Seth Vargo <sethvargo@gmail.com>
+  class UnknownCompressionType < BerkshelfError
+    status_code(131)
+
+    def initialize(destination)
+      @destination = destination
+    end
+
+    def to_s
+      "The file at '#{@destination}' is not a known compression type!"
+    end
+  end
+
+  # @author Seth Vargo <sethvargo@gmail.com>
+  #
+  # Raised when a cookbook or its recipes contain a space or invalid
+  # character in the path.
+  #
+  # @param [Berkshelf::CachedCookbook] cookbook
+  #   the cookbook that failed validation
+  # @param [Array<#to_s>] files
+  #   the list of files that were not valid
+  class InvalidCookbookFiles < BerkshelfError
+    status_code(132)
+
+    def initialize(cookbook, files)
+      @cookbook = cookbook
+      @files = files
+    end
+
+    def to_s
+      [
+        "The cookbook '#{@cookbook.cookbook_name}' has invalid filenames:",
+        "",
+        "  " + @files.map(&:to_s).join("\n  "),
+        "",
+        "Please note, spaces are not a valid character in filenames."
+      ].join("\n")
+    end
+  end
 end

data/lib/berkshelf/locations/chef_api_location.rb

@@ -174,7 +174,8 @@ module Berkshelf
         else
           conn.cookbook.latest_version(name)
         end
-      rescue Ridley::Errors::HTTPNotFound
+      rescue Ridley::Errors::HTTPNotFound,
+             Ridley::Errors::ResourceNotFound
         @target_cookbook = nil
       end
 

data/lib/berkshelf/locations/git_location.rb

@@ -63,23 +63,21 @@ module Berkshelf
       end
 
       tmp_path = rel ? File.join(clone, rel) : clone
-      puts "File.chef_cookbook?(tmp_path): #{File.chef_cookbook?(tmp_path)}"
       unless File.chef_cookbook?(tmp_path)
         msg = "Cookbook '#{name}' not found at git: #{uri}"
         msg << " with branch '#{branch}'" if branch
         msg << " at path '#{rel}'" if rel
         raise CookbookNotFound, msg
       end
-      
+
       cb_path = File.join(destination, "#{name}-#{branch_name}")
       FileUtils.rm_rf(cb_path)
       FileUtils.mv(tmp_path, cb_path)
-      
+
       cached = CachedCookbook.from_store_path(cb_path)
       validate_cached(cached)
 
       set_downloaded_status(true)
-      puts "cached.class: #{cached.class}"
       cached
     end
 

data/lib/berkshelf/locations/site_location.rb

@@ -22,7 +22,9 @@ module Berkshelf
       @name               = name
       @version_constraint = version_constraint
 
-      api_uri = if options[:site].nil? || SHORTNAMES.has_key?(options[:site])
+      api_uri = if options[:site].nil?
+        SHORTNAMES[:opscode]
+      elsif SHORTNAMES.has_key?(options[:site])
         SHORTNAMES[options[:site]]
       elsif options[:site].kind_of?(Symbol)
         raise InvalidSiteShortnameError.new(options[:site])

data/lib/berkshelf/ui.rb

@@ -10,12 +10,16 @@ module Berkshelf
       @mute = false
     end
 
-    def say(message = "", color = nil, force_new_line = nil)
+    def say(message = '', color = nil, force_new_line = (message.to_s !~ /( |\t)\Z/))
       return if quiet?
 
-      super(message, color)
+      super(message, color, force_new_line)
+    end
+
+    # @see {say}
+    def info(message = '', color = nil, force_new_line = (message.to_s !~ /( |\t)\Z/))
+      say(message, color, force_new_line)
     end
-    alias_method :info, :say
 
     def say_status(status, message, log_status = true)
       return if quiet?
@@ -25,7 +29,7 @@ module Berkshelf
 
     def warn(message, color = :yellow)
       return if quiet?
-      
+
       say(message, color)
     end
 

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "1.4.5"
+  VERSION = "1.4.6"
 end

data/spec/config/berkshelf.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAs3u5qfmdEWtzYHvXpbQRyefhUjeTG7nwhn/LaYY6ou19xxW0
+I5MKSBqCxUCHqODRc7ox8zSF37x3jMBHbSczOcfbWsSe/qGnmvZZQhHmXCje2zkW
+ByaRHmmatzkz1aAqAmZm/wdSuVLXytsbrPXuaj/MiHa6QH3e/ZFaYME7rMkouqfC
+pUlSa2tZ9Ko1ZCCwjkiifuP4yQFsS6/G6b8c7F8wdq4byfJ9o6FN34lJHrzfG0ZV
+hwS47Bdn6FDBQ6PVxrBsvQNE2n7QlNLfXWi4Tb8OpmQif01FjxleAr5kamx3GD+s
+jC7fKHE9bZ0apZ1MVmkz9PhFmOigV5jl9Att+QIDAQABAoIBAQCCG6qXgQ9PVWkq
+BBxrToGmr6UzCH5nlv65QWKfeGKBQU/wRdd0Al9trWomu4Sb831iOxOCjgyOB/1R
+1wDwK36C4FIvFmF7jIwHVZWWw4sOO8JxgIxrWpXQShWRxLHCpnxNiRYYwaJCHb+4
+meUSGKVf+Ce4tPiHT7eacQfnI6yyr1hWusKu0I8w7NsfeNc+/Rpne6mifLfaB/9u
+b9kgfD15HGEsuUaMLZ/y1HFWvw2G2Og1cDrIpBIVtUAhA+DnjjLe/YoETeSmQAxH
+ioQpJJ/gSqtTczIoyPXXiwaF5wUTQrsn5zZhTs9mAQy7hcSR92IH2xBSmK3+wlz0
+vHZIq9rRAoGBAOeRUTRDgj+f+BlH1qFqf4EfkBN5quVM2808LYBGZWfA5/6o9jSN
+AM84VXq3S8Wy5V6UMcSv4mOqEr3tEUYE8or9r/RxzpGahSdi8Ttju9vvpJH5I3xr
+xx2ZK/vlrAfr6JHlE4bqqc5unCslUt2/liCWpERQ3cFcPydQb7Imrm+DAoGBAMZr
+mcxBeMyQHG6Kcpc7EQXZ5i7a8T6ksPu7FbAZ70Meb9UMtVIYpVBalutCXKhl7D4K
+qrCmV2gQryBz+S7AecFZSKvXdb7ueYzf8EcI/v+loNu9v9/4m4YV3bPBkMhW5kcK
+xFnVIsYqUlR+dsS8JfjSCpk4lePVSSt7B26eIFfTAoGBAJHPDKSuBWtunNe+RkUp
+O9PgPeYlbBgqBxT52WS17tAfxXSyiySXzHSuchRtKgb4GDkvcw73+MLsqhRxG7lN
+EDO4fXyb1IgWFdWxFVhh+j4IbUWE7HVBoAThF7Lq8SGjx7Nl3J/NTtKvDyKTw9Pg
++PTYJeLmUFuabCGjIlG4zYllAoGBAIwe5oB4597GEl35xUyI+M+B/myuTtknIpjS
+mFFBL1bdwqnYjJ+KKgwhvRwsRBTjzT5O+BVBks45ogKwA5OBdzoUXB6GTG9mJ05V
+wm/XqYRNqdgkGsEG5oV9IZBUrHLd80bOErVBr4nzzyo+GI98MvCRG8zySd+X+lEL
+U8dJQZvjAoGAWorll+fomfie6t5XbkpwMo8rn60yFUiRE7HWxA2qDj3IpoE6SfNE
+eOpsf1Zzx30r8answ9lPnd753ACdgNzE66ScWD+cQeB6OlMZMaW5tVSjddZ7854L
+00znt8b1OLkVY33xfsa89wKH343304BhVHABPMxm5Leua/H21/BqSK0=
+-----END RSA PRIVATE KEY-----

data/spec/{knife.rb.sample → config/knife.rb}

@@ -4,8 +4,8 @@ log_level                :info
 log_location             STDOUT
 node_name                "berkshelf"
 client_key               "#{current_dir}/berkshelf.pem"
-validation_client_name   "chef-validator"
-validation_key           "#{current_dir}/chef-validator.pem"
+validation_client_name   "validator"
+validation_key           "#{current_dir}/validator.pem"
 chef_server_url          "http://localhost:4000"
 cache_type               'BasicFile'
 cache_options( :path => "#{ENV['HOME']}/.chef/checksums" )

data/spec/config/validator.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAxvMbzsVt0PJ0ozcpQZC+zpaWYAZe/nHnSFeTkm9BAtQUA8vp
+cKMJTXNw4Lm3jcotrPATMgGgwVG7ram689JcQSnwSgIFinr5ZLRB22qyGdqHHmAf
+w4RVde6dJON2IqI51JzQ5Pfs+M1SYcKiCzcBHvFddug5VcMjipFLv7QPKDmal8Ep
+tOtRhb8Ad2DBXV7gX3e8ZaKfQgA0uc07g1KmcjR7vOG25nxY6NRxTwWn5+uMVgCp
+1xjbBeq7XF2gJPYVNsNRu8C3/rMX7D3NuKpJGj3CsKOtECREsq+7lk7A7OPzrP0g
+Um/dUSeV99FLavrJNZ8TRc+BLZD/RiE1x0wG9wIDAQABAoIBAAbRchSGA5tzk7e8
+Pje3BDMESicEUOEbejeqeK4+DdZQ+lae+GMZ00nKOQYal0XOtf4FREMkdyPo7yum
+c3fDr9Gz5D5FD3eNe1qOKuugHnZwXM0Xsj77HAqsoMoQ2Y2aTa0Rqr8OGBr2vmoH
+R5Jm0i0DTJa0orJju6YWEKiDPTm9oCT025M3G4kswM4jnzQiTciksfEYJGIK1Alk
+Lcct/8TtyoYNhzYfzFi2wIQx4Iy6o/2AqWjvcJT2RI3cge5CBOXR7Y1Zqt5/vWm+
+MvSy+krujFTTKpJKbatOsRGoCX6e8IcIQ4MtOj9jSPQPvGcQrjEdks6+zKID6INW
+ZZYrvqECgYEA8EKB/oYzNueoBvaFcw1ONUNScYnr9IS/7oZnciw53cMwDumsH9qB
+NbEH6m1/2EQhOU5KoAQX2qd8KNQ6oIL1ae51ACtdEBP9Sb9j2q+IlEOf3bLga+w1
+DXeQ0wx4ZHyF6a2AJK4qVO+nDnYw074VxaApLXDyfXpIS7N9lOJxeb8CgYEA0/vF
+mt/+r6v2YOVWtSah44lIyaDj3N6fjYcI34aJvowwe+Njfnd2o4BkqhthQKOnl6FI
+SQPrLBdwc4OvN9oWMZHX2b0ols0Bf5ZxAfqMvCS2JG+SiiZT+p+cPnCitfPZ6zn7
+5SMpVMqlMS8GxNze8ZkieQ7PaF28rF0xUJZIkMkCgYEAwspJNqB7OVKMCkkoXOU2
+uTxBxUe7A9309mAF0q1EpSUw+4Y8RP8UrwE+l7P7aM2j2iA9pIptBJuxsDCQ7739
+Vss8FM0TgIuUWYxQWubh5sMFA+uYxCcXxDliM5nyqhXDRHekYxjJvV8npDPy1llQ
+sY9ukyb1kwHnR2jYsjL9KWUCgYAmB1vKzfZVs4bOmTX154lRVXaOXWOjYvjCnf/0
+gaFCYsnr374gmPPanxTwA1tuCi3toMxj9OUCku3kezI61c/3co+Di1C1xO9I4UdC
+sJ0Av6FBZham2/ti0bFo7jHybF2iulM7JxSqFnSOHz6aoHkKZItvpj2FHpPTZCCN
+sXgxKQKBgDyBsl4/LCG+eQrxaL6Y7DHP9oNTw5hRbQWlZlXfygyUbKCqj1OfOrVu
+hDAn/ElMLgSgRbI8nXq68cu6UE4wO4Di6fQyCb2pP7tgS+0swbq85YoMbHh/z+yN
+WUvLQHfN4RHJStY3JX/cBcSoIiArNbuFcPThM02YBDhbiW+NQhZV
+-----END RSA PRIVATE KEY-----

data/spec/spec_helper.rb

@@ -15,7 +15,7 @@ Spork.prefork do
 
   APP_ROOT = File.expand_path('../../', __FILE__)
   ENV["BERKSHELF_PATH"] = File.join(APP_ROOT, "spec", "tmp", "berkshelf")
-  ENV["BERKSHELF_CHEF_CONFIG"] = File.join(APP_ROOT, "spec", "knife.rb")
+  ENV["BERKSHELF_CHEF_CONFIG"] = File.join(APP_ROOT, "spec", "config", "knife.rb")
 
   Dir[File.join(APP_ROOT, "spec/support/**/*.rb")].each {|f| require f}
 
@@ -36,6 +36,15 @@ Spork.prefork do
     config.filter_run focus: true
     config.run_all_when_everything_filtered = true
 
+    config.before(:suite) do
+      Berkshelf::RSpec::ChefServer.start
+      WebMock.disable_net_connect!(allow_localhost: true, net_http_connect_on_start: true)
+    end
+
+    config.after(:suite) do
+      Berkshelf::RSpec::ChefServer.stop
+    end
+
     config.before(:each) do
       clean_tmp_path
       Berkshelf.cookbook_store = Berkshelf::CookbookStore.new(tmp_path.join("downloader_tmp"))
@@ -155,8 +164,6 @@ Spork.prefork do
   def run(cmd)
     `#{cmd}`
   end
-
-  Berkshelf::RSpec::Knife.load_knife_config(File.join(APP_ROOT, 'spec/knife.rb'))
 end
 
 Spork.each_run do

data/spec/support/chef_api.rb

@@ -24,7 +24,8 @@ module Berkshelf
         else
           ridley.cookbook.delete(name, version)
         end
-      rescue Ridley::Errors::HTTPNotFound
+      rescue Ridley::Errors::HTTPNotFound,
+             Ridley::Errors::ResourceNotFound
         true
       end
 
@@ -36,7 +37,8 @@ module Berkshelf
         else
           !versions.find { |ver| ver == version }.nil?
         end
-      rescue Ridley::Errors::HTTPNotFound
+      rescue Ridley::Errors::HTTPNotFound,
+             Ridley::Errors::ResourceNotFound
         false
       end
 

data/spec/support/chef_server.rb

@@ -0,0 +1,73 @@
+require 'chef_zero/server'
+
+module Berkshelf::RSpec
+  module ChefServer
+    PORT = 8889
+
+    class << self
+      def clear_request_log
+        @request_log = Array.new
+      end
+
+      def request_log
+        @request_log ||= Array.new
+      end
+
+      def server
+        @server ||= ChefZero::Server.new(port: PORT, generate_real_keys: false)
+      end
+
+      def server_url
+        (@server && @server.url) || "http://localhost:#{PORT}"
+      end
+
+      def start
+        server.start_background
+        server.on_response do |request, response|
+          request_log << [ request, response ]
+        end
+        clear_request_log
+
+        server
+      end
+
+      def stop
+        @server.stop if running?
+      end
+
+      def running?
+        @server && @server.running?
+      end
+    end
+
+    def chef_server
+      ChefServer.server
+    end
+
+    def chef_client(name, hash = Hash.new)
+      load_data(:clients, name, hash)
+    end
+
+    def chef_data_bag(name, hash = Hash.new)
+      ChefServer.server.load_data({ 'data' => { name => hash }})
+    end
+
+    def chef_environment(name, hash = Hash.new)
+      load_data(:environments, name, hash)
+    end
+
+    def chef_node(name, hash = Hash.new)
+      load_data(:nodes, name, hash)
+    end
+
+    def chef_role(name, hash = Hash.new)
+      load_data(:roles, name, hash)
+    end
+
+    private
+
+      def load_data(key, name, hash)
+        ChefServer.server.load_data({ key.to_s => { name => MultiJson.encode(hash) }})
+      end
+  end
+end

data/spec/support/matchers/file_system_matchers.rb

@@ -3,7 +3,7 @@
 module Berkshelf
   module RSpec
     module FileSystemMatchers
-      class File < ::File
+      class FileMatcher
         def initialize(name, &block)
           @contents = []
           @negative_contents = []
@@ -27,7 +27,7 @@ module Berkshelf
             throw :failure, root.join(@name)
           end
 
-          contents = ::File.read(root.join(@name))
+          contents = File.read(root.join(@name))
 
           @contents.each do |string|
             unless contents.include?(string)
@@ -43,7 +43,7 @@ module Berkshelf
         end
       end
 
-      class Directory
+      class DirectoryMatcher
         attr_reader :tree
 
         def initialize(root = nil, &block)
@@ -54,12 +54,12 @@ module Berkshelf
         end
 
         def directory(name, &block)
-          @tree[name] = block_given? && Directory.new(location(name), &block)
+          @tree[name] = block_given? && DirectoryMatcher.new(location(name), &block)
         end
 
         def file(name, &block)
           silence_warnings do
-            @tree[name] = Berkshelf::RSpec::FileSystemMatchers::File.new(location(name), &block)
+            @tree[name] = FileMatcher.new(location(name), &block)
           end
         end
 
@@ -92,7 +92,7 @@ module Berkshelf
         end
       end
 
-      class Root < Directory
+      class RootMatcher < DirectoryMatcher
         def failure_message
           if @failure.is_a?(Array) && @failure[0] == :not
             if @failure[2]
@@ -125,7 +125,7 @@ module Berkshelf
       end
 
       def have_structure(&block)
-        Root.new(&block)
+        RootMatcher.new(&block)
       end
     end
   end