berkshelf 2.0.0.beta → 2.0.0

data/lib/berkshelf/mixin/config.rb

@@ -0,0 +1,155 @@
+module Berkshelf
+  module Mixin
+    module Config
+      def self.included(base)
+        base.send(:extend, ClassMethods)
+      end
+
+      module ClassMethods
+        # Load a Chef configuration from the given path.
+        #
+        # @raise [Berkshelf::ConfigNotFound]
+        #   if the specified path does not exist on the system
+        def from_file(filepath)
+          self.new(filepath)
+        rescue Errno::ENOENT => e
+          raise Berkshelf::ConfigNotFound.new(self.class.name, filepath)
+        end
+
+        # Load the contents of the most probable Chef config. See {location}
+        # for more information on how this logic is decided.
+        def load
+          self.new(location)
+        end
+
+        # Class method for defining a default option.
+        #
+        # @param [#to_sym] option
+        #   the symbol to store as the key
+        # @param [Object] value
+        #   the return value
+        def default_option(option, value)
+          default_options[option.to_sym] = value
+        end
+
+        # A list of all the default options set by this class.
+        #
+        # @return [Hash]
+        def default_options
+          @default_options ||= {}
+        end
+
+        # The default location of the configuration file.
+        #
+        # @param [#to_s] path
+        #   the path to the default location of the configuration file
+        def default_location(path)
+          @default_location = File.expand_path(path)
+        end
+
+        # @return [String, nil]
+        attr_reader :default_location
+
+        # Converts a path to a path usable for your current platform
+        #
+        # @param [String] path
+        #
+        # @return [String]
+        def platform_specific_path(path)
+          if RUBY_PLATFORM =~ /mswin|mingw|windows/
+            system_drive = ENV['SYSTEMDRIVE'] ? ENV['SYSTEMDRIVE'] : ""
+            path         = win_slashify File.join(system_drive, path.split('/')[2..-1])
+          end
+
+          path
+        end
+
+        private
+          # @abstract
+          #   include and override {location} in your class to define the
+          #   default location logic
+          def location
+            default_location || raise(AbstractFunction, "You must implement #{self.class}#location to define default location logic!")
+          end
+
+          # Convert a unixy filepath to a windowsy filepath. Swaps forward slashes for
+          # double backslashes
+          #
+          # @param [String] path
+          #   filepath to convert
+          #
+          # @return [String]
+          #   converted filepath
+          def win_slashify(path)
+            path.gsub(File::SEPARATOR, (File::ALT_SEPARATOR || '\\'))
+          end
+      end
+
+      # The path to the file.
+      #
+      # @return [String, nil]
+      attr_reader :path
+
+      # Create a new configuration file from the given path.
+      #
+      # @param [#to_s, nil] filepath
+      #   the filepath to read
+      def initialize(filepath = nil)
+        @path = filepath ? File.expand_path(filepath.to_s) : nil
+        load
+      end
+
+      # Read and evaluate the contents of the filepath, if one was given at the
+      # start.
+      #
+      # @return [Berkshelf::Mixin::Config]
+      def load
+        configuration # Need to call this to make sure it's populated
+        self.instance_eval(IO.read(path), path, 1) if path && File.exists?(path)
+        self
+      end
+
+      # Force a reload the contents of this file from disk.
+      #
+      # @return [Berkshelf::Mixin::Config]
+      def reload!
+        @configuration = nil
+        load
+        self
+      end
+
+      # Return the configuration value for the given key.
+      #
+      # @param [#to_sym] key
+      #   they key to find a configuration value for
+      def [](key)
+        configuration[key.to_sym]
+      end
+
+      def method_missing(m, *args, &block)
+        if args.length > 0
+          configuration[m.to_sym] = (args.length == 1) ? args[0] : args
+        else
+          configuration[m.to_sym]
+        end
+      end
+
+      # Save the contents of the file to the originally-supplied path.
+      def save
+        File.open(path, 'w+') { |f| f.write(to_rb + "\n") }
+      end
+
+      # Convert the file back to Ruby.
+      #
+      # @return [String]
+      def to_rb
+        configuration.map { |k,v| "#{k}(#{v.inspect})" }.join("\n")
+      end
+
+      private
+        def configuration
+          @configuration ||= self.class.default_options.dup
+        end
+    end
+  end
+end

data/lib/berkshelf/mixin/logging.rb

@@ -1,6 +1,5 @@
 module Berkshelf
   module Mixin
-    # @author Jamie Winsor <reset@riotgames.com>
     module Logging
       def log
         Berkshelf::Logger

data/lib/berkshelf/mixin/shellout.rb

@@ -0,0 +1,71 @@
+require 'hashie'
+
+module Berkshelf
+  module Mixin
+    module Shellout
+      # Perform a cross-platform shell command, returning the process result.
+      # This uses Process.spawn under the hood for Ruby 1.9, so see
+      # {Process.spawn} for more information.
+      #
+      # On JRuby, a system command is used and $stdout and $stderr are captured.
+      #
+      # @param [String] command
+      # @param [Hash] options
+      #   a list of options to send to {Process.spawn}
+      # @return [Hashie::Mash]
+      #   information about the command including:
+      #     - stderr
+      #     - stdout
+      #     - exitstatus
+      #     - pid
+      #     - success?
+      #     - failure?
+      def shellout(command)
+        if defined?(RUBY_PLATFORM) && RUBY_PLATFORM == 'java' # jruby
+          out, err, e = capture do
+            system(command)
+          end
+        else
+          begin
+            out_file, err_file = Tempfile.new('berkshelf.stdout'), Tempfile.new('berkshelf.stderr')
+            pid = Process.spawn({}, command, out: out_file.to_i, err: err_file.to_i)
+            Process.waitpid(pid)
+
+            out, err = File.read(out_file), File.read(err_file)
+            e = $?
+          rescue Errno::ENOENT
+            out, err = "", "command not found: #{command}"
+            e = $?
+          end
+        end
+
+        Hashie::Mash.new({
+          stdout:         out.strip,
+          stderr:         err.strip,
+          exitstatus:     e.exitstatus,
+          pid:            e.pid,
+          success?:       e.success?,
+          failure?:       !e.success?
+        })
+      end
+
+      private
+        # Execute the given block, capturing $stdout, $stderr, and the returned process.
+        #
+        # @return [Array<StringIO, StringIO, Process>]
+        #   a tuple of $stdout, $stderr, and the Process
+        def capture(&block)
+          out, err = StringIO.new, StringIO.new
+          $stdout, $stderr = out, err
+
+          yield
+
+          out.rewind
+          err.rewind
+          return out.read, err.read, $?
+        ensure
+          $stdout, $stderr = STDOUT, STDERR
+        end
+    end
+  end
+end

data/lib/berkshelf/resolver.rb

@@ -1,6 +1,9 @@
 module Berkshelf
-  # @author Jamie Winsor <reset@riotgames.com>
   class Resolver
+    require_relative 'cookbook_source'
+    require_relative 'locations/git_location'
+    require_relative 'locations/path_location'
+
     extend Forwardable
 
     # @return [Berkshelf::Berksfile]
@@ -132,7 +135,7 @@ module Berkshelf
       # @return [Boolean]
       def install_source(source)
         cached_cookbook, location = downloader.download(source)
-        Berkshelf.formatter.install source.name, cached_cookbook.version, location
+        Berkshelf.formatter.install(source.name, cached_cookbook.version, location)
       end
 
       # Use the given source to create a constraint solution if the source has been downloaded or can
@@ -164,8 +167,8 @@ module Berkshelf
           get_source(source).cached_cookbook = cached
         end
 
-        path = source.location.is_a?(PathLocation) ? "#{source.location}" : nil
-        Berkshelf.formatter.use cached.cookbook_name, cached.version, path
+        path = source.location.is_a?(PathLocation) ? source.location.to_s : nil
+        Berkshelf.formatter.use(cached.cookbook_name, cached.version, path)
 
         true
       end

data/lib/berkshelf/test.rb

@@ -3,8 +3,6 @@ module Berkshelf
   # stubs across a run (See RiotGames/berkshelf#208). As a work-around, we pass
   # "special" mocks and stubs into the TEST environment variable. This class
   # parses and then requires the appropriate mocks during the run.
-  #
-  # @author Seth Vargo <sethvargo@gmail.com>
   class Mocks
     require 'rspec/mocks/standalone'
 
@@ -34,4 +32,4 @@ end
 
 unless (keys = Berkshelf::Mocks.env_keys & ENV.keys).empty?
   Berkshelf::Mocks.new(keys)
-end
+end

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 = "2.0.0.beta"
+  VERSION = '2.0.0'
 end

data/lib/thor/monkies/shell.rb

@@ -1,5 +1,4 @@
 require 'berkshelf/ui'
 
-# @author Seth Vargo <sethvargo@gmail.com>
 # Include the Berkshelf UI methods - this is used by both Vagrant and Berkshelf
 Thor::Base.shell.send(:include, Berkshelf::UI)

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/config/knife.rb

@@ -0,0 +1,12 @@
+current_dir = File.expand_path(File.dirname(__FILE__))
+
+log_level                :info
+log_location             STDOUT
+node_name                "berkshelf"
+client_key               "#{current_dir}/berkshelf.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" )
+cookbook_path            []

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

@@ -7,7 +7,6 @@ require 'bundler'
 require 'spork'
 
 Spork.prefork do
-  require 'json_spec'
   require 'pp'
   require 'rspec'
   require 'webmock/rspec'
@@ -15,7 +14,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}
 
@@ -29,7 +28,6 @@ Spork.prefork do
 
   RSpec.configure do |config|
     config.include Berkshelf::RSpec::FileSystemMatchers
-    config.include JsonSpec::Helpers
     config.include Berkshelf::RSpec::ChefAPI
     config.include Berkshelf::RSpec::ChefServer
 
@@ -43,12 +41,12 @@ Spork.prefork do
     config.filter_run focus: true
     config.run_all_when_everything_filtered = true
 
-    config.before(:all) do
+    config.before(:suite) do
       Berkshelf::RSpec::ChefServer.start
       WebMock.disable_net_connect!(allow_localhost: true, net_http_connect_on_start: true)
     end
 
-    config.after(:all) do
+    config.after(:suite) do
       Berkshelf::RSpec::ChefServer.stop
     end
 
@@ -119,7 +117,7 @@ Spork.prefork do
     path = ''
     capture(:stdout) do
       Dir.chdir(remote_bucket) do
-        Berkshelf::Cli.new.invoke(:cookbook, [name], skip_vagrant: true, force: true)
+        Berkshelf::Cli.new.invoke(:cookbook, [name], skip_vagrant: true, skip_test_kitchen: true, force: true)
       end
 
       Dir.chdir(path = remote_bucket.join(name)) do
@@ -174,8 +172,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