berkshelf 0.5.0.rc2 → 0.5.0.rc3

data/lib/berkshelf.rb

@@ -6,6 +6,7 @@ require 'zlib'
 require 'archive/tar/minitar'
 require 'solve'
 require 'ridley'
+require 'thor'
 require 'chef/knife'
 require 'chef/platform'
 require 'chef/cookbook/metadata'
@@ -15,6 +16,7 @@ require 'active_support/core_ext'
 require 'berkshelf/version'
 require 'berkshelf/core_ext'
 require 'berkshelf/errors'
+require 'thor/monkies'
 
 Chef::Config[:cache_options][:path] = Dir.mktmpdir
 

data/lib/berkshelf/berksfile.rb

@@ -367,6 +367,17 @@ module Berkshelf
     # @option options [Symbol, Array] :only
     #   Group(s) to include which will cause any sources marked as a member of the
     #   group to be installed and all others to be ignored
+    # @option options [Integer] :thread_count
+    # @option options [Hash] :params
+    #   URI query unencoded key/value pairs
+    # @option options [Hash] :headers
+    #   unencoded HTTP header key/value pairs
+    # @option options [Hash] :request
+    #   request options
+    # @option options [Hash] :ssl
+    #   SSL options
+    # @option options [URI, String, Hash] :proxy
+    #   URI, String, or Hash of HTTP proxy options
     def upload(options = {})
       uploader = Uploader.new(options)
       solution = resolve(options)

data/lib/berkshelf/cli.rb

@@ -1,8 +1,8 @@
-require 'thor'
-require 'thor/monkies'
 require 'berkshelf'
 
 module Berkshelf
+  Thor::Base.shell = Berkshelf::UI
+
   # @author Jamie Winsor <jamie@vialstudios.com>
   class Cli < Thor
     class << self
@@ -14,7 +14,6 @@ module Berkshelf
     
     def initialize(*args)
       super(*args)
-      self.shell = Berkshelf.ui
       Berkshelf.config_path = @options[:config]
       Berkshelf.set_format @options[:format]
       @options = options.dup # unfreeze frozen options Hash from Thor
@@ -108,6 +107,10 @@ module Berkshelf
       type: :boolean,
       default: false,
       desc: "Upload all cookbooks even if a frozen one exists on the target Chef Server"
+    option :ssl_verify,
+      type: :boolean,
+      default: true,
+      desc: "Disable/Enable SSL verification when uploading cookbooks"
     desc "upload", "Upload the Cookbooks specified by a Berksfile or a Berksfile.lock to a Chef Server."
     def upload
       Berkshelf.load_config 
@@ -117,7 +120,10 @@ module Berkshelf
         server_url: Chef::Config[:chef_server_url],
         client_name: Chef::Config[:node_name],
         client_key: Chef::Config[:client_key],
-        organization: ChefAPILocation.extract_organization(Chef::Config[:chef_server_url])
+        organization: ChefAPILocation.extract_organization(Chef::Config[:chef_server_url]),
+        ssl: {
+          verify: options[:ssl_verify]
+        }
       )
     end
 

data/lib/berkshelf/ui.rb

@@ -1,5 +1,5 @@
 module Berkshelf
-  class UI < Thor::Shell::Color
+  class UI < ::Thor::Shell::Basic
     # Mute the output of this instance of UI until {#unmute!} is called
     def mute!
       @mute = true
@@ -10,10 +10,10 @@ module Berkshelf
       @mute = false
     end
 
-    def say(message, color = nil, force_new_line = (message.to_s !~ /( |\t)$/))
+    def say(message = "", color = nil, force_new_line = nil)
       return if quiet?
 
-      super(message, color, force_new_line)
+      super(message, color)
     end
     alias_method :info, :say
 

data/lib/berkshelf/uploader.rb

@@ -17,6 +17,17 @@ module Berkshelf
     # @option options [String] :organization
     #   the Organization to connect to. This is only used if you are connecting to
     #   private Chef or hosted Chef
+    # @option options [Integer] :thread_count
+    # @option options [Hash] :params
+    #   URI query unencoded key/value pairs
+    # @option options [Hash] :headers
+    #   unencoded HTTP header key/value pairs
+    # @option options [Hash] :request
+    #   request options
+    # @option options [Hash] :ssl
+    #   SSL options
+    # @option options [URI, String, Hash] :proxy
+    #   URI, String, or Hash of HTTP proxy options
     def initialize(options = {})
       @conn = Ridley.connection(options)
     end

data/lib/berkshelf/vagrant.rb

@@ -10,6 +10,7 @@ module Berkshelf
       autoload :Upload, 'berkshelf/vagrant/action/upload'
       autoload :Clean, 'berkshelf/vagrant/action/clean'
       autoload :SetUI, 'berkshelf/vagrant/action/set_ui'
+      autoload :Validate, 'berkshelf/vagrant/action/validate'
     end
 
     autoload :Config, 'berkshelf/vagrant/config'
@@ -56,10 +57,13 @@ module Berkshelf
       # Initialize the Berkshelf Vagrant middleware stack
       def init!
         ::Vagrant.config_keys.register(:berkshelf) { Berkshelf::Vagrant::Config }
-        ::Vagrant.actions[:provision].insert(::Vagrant::Action::VM::Provision, Berkshelf::Vagrant::Middleware.install)
-        ::Vagrant.actions[:provision].insert(::Vagrant::Action::VM::Provision, Berkshelf::Vagrant::Middleware.upload)
-        ::Vagrant.actions[:start].insert(::Vagrant::Action::VM::Provision, Berkshelf::Vagrant::Middleware.install)
-        ::Vagrant.actions[:start].insert(::Vagrant::Action::VM::Provision, Berkshelf::Vagrant::Middleware.upload)
+
+        [ :provision, :start ].each do |action|
+          ::Vagrant.actions[action].insert(::Vagrant::Action::General::Validate, Berkshelf::Vagrant::Action::Validate)
+          ::Vagrant.actions[action].insert(::Vagrant::Action::VM::Provision, Berkshelf::Vagrant::Middleware.install)
+          ::Vagrant.actions[action].insert(::Vagrant::Action::VM::Provision, Berkshelf::Vagrant::Middleware.upload)
+        end
+
         ::Vagrant.actions[:destroy].insert(::Vagrant::Action::VM::CleanMachineFolder, Berkshelf::Vagrant::Middleware.clean)
       end
     end

data/lib/berkshelf/vagrant/action/upload.rb

@@ -6,16 +6,19 @@ module Berkshelf
         attr_reader :berksfile
         attr_reader :node_name
         attr_reader :client_key
+        attr_reader :ssl_verify
 
         def initialize(app, env)
           @app = app
           @node_name  = env[:global_config].berkshelf.node_name
           @client_key = env[:global_config].berkshelf.client_key
+          @ssl_verify = env[:global_config].berkshelf.client_key
           @berksfile  = Berksfile.from_file(env[:global_config].berkshelf.berksfile_path)
         end
 
         def call(env)
           if Berkshelf::Vagrant.chef_client?(env[:global_config])
+            p env[:global_config].berkshelf
             upload(env)
           end
 
@@ -28,9 +31,12 @@ module Berkshelf
             Berkshelf::Vagrant.provisioners(:chef_client, env[:global_config]).each do |provisioner|
               Berkshelf.formatter.msg "uploading cookbooks to '#{provisioner.config.chef_server_url}'"
               berksfile.upload(
-                provisioner.config.chef_server_url,
-                node_name: self.node_name,
-                client_key: self.client_key
+                server_url: provisioner.config.chef_server_url,
+                client_name: self.node_name,
+                client_key: self.client_key,
+                ssl: {
+                  verify: self.ssl_verify
+                }
               )
             end
           end

data/lib/berkshelf/vagrant/action/validate.rb

@@ -0,0 +1,30 @@
+module Berkshelf
+  module Vagrant
+    module Action
+      # @author Jamie Winsor <jamie@vialstudios.com>
+      #
+      # As of Vagrant 1.0.5 it is not possible to validate configuration values of
+      # a configuraiton that was not explicitly described in a Vagrant::Config.run block.
+      #
+      # In our case we want some values set for our middleware stacks even if the user does
+      # not explicitly set values for settings in `config.berkshelf`.
+      class Validate
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          recorder = ::Vagrant::Config::ErrorRecorder.new
+          env[:vm].config.berkshelf.validate(env[:vm].env, recorder)
+          
+          unless recorder.errors.empty?
+            raise ::Vagrant::Errors::ConfigValidationFailed, 
+              messages: ::Vagrant::Util::TemplateRenderer.render("config/validation_failed", errors: { berkshelf: recorder })
+          end
+
+          @app.call(env)          
+        end
+      end
+    end
+  end
+end

data/lib/berkshelf/vagrant/config.rb

@@ -2,20 +2,43 @@ module Berkshelf
   module Vagrant
     # @author Jamie Winsor <jamie@vialstudios.com>
     # @author Andrew Garson <andrew.garson@gmail.com>
+    #
+    # @note according to <http://vagrantup.com/v1/docs/extending/configuration.html> instance
+    #   variables should not be instantiated with default values in the initializer of a Config file.
+    #   Instead explicit getters which set and return the default value should be used.
     class Config < ::Vagrant::Config::Base
-      # return [String]
+      # @return [String]
       #   path to a knife configuration file
-      attr_reader :config_path
+      def config_path
+        @config_path ||= Berkshelf::DEFAULT_CONFIG
+      end
+
+      # @param [String] value
+      def config_path=(value)
+        @config_path = File.expand_path(value)
+      end
 
       # @return [String]
       #   path to the Berksfile to use with Vagrant
-      attr_reader :berksfile_path
+      def berksfile_path
+        @berksfile_path ||= File.join(Dir.pwd, Berkshelf::DEFAULT_FILENAME)
+      end
+
+      # @param [String] value
+      def berksfile_path=(value)
+        @berksfile_path = File.expand_path(value)
+      end
 
       # @return [String]
       #   A path to a client key on disk to use with the Chef Client provisioner to
       #   upload cookbooks installed by Berkshelf.
       attr_reader :client_key
 
+      # @param [String] value
+      def client_key=(value)
+        @client_key = File.expand_path(value)
+      end
+
       # @return [String]
       #   A client name (node_name) to use with the Chef Client provisioner to upload
       #   cookbooks installed by Berkshelf.
@@ -24,31 +47,25 @@ module Berkshelf
       # @return [Array<Symbol>]
       #   cookbooks in all other groups except for these will be installed
       #   and copied to Vagrant's shelf
-      attr_accessor :except
+      def except
+        @except ||= Array.new
+      end
+      attr_writer :except
 
       # @return [Array<Symbol>]
       #   only cookbooks in these groups will be installed and copied to
       #   Vagrant's shelf
-      attr_accessor :only
-
-      def initialize
-        @config_path = Berkshelf::DEFAULT_CONFIG
-        @berksfile_path = File.join(Dir.pwd, Berkshelf::DEFAULT_FILENAME)
-        @only = Array.new
-        @except = Array.new
-      end
-
-      def config_path=(value)
-        @config_path = File.expand_path(value)
+      def only
+        @only ||= Array.new
       end
+      attr_writer :only
 
-      def berksfile_path=(value)
-        @berksfile_path = File.expand_path(value)
-      end
-
-      def client_key=(value)
-        @client_key = File.expand_path(value)
+      # @return [Boolean]
+      #   should connections to a Chef API use SSL verification
+      def ssl_verify
+        @ssl_verify ||= true
       end
+      attr_writer :ssl_verify
 
       def validate(env, errors)
         if !except.empty? && !only.empty?

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "0.5.0.rc2"
+  VERSION = "0.5.0.rc3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 0.5.0.rc2
+  version: 0.5.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2012-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ridley
@@ -514,6 +514,7 @@ files:
 - lib/berkshelf/vagrant/action/install.rb
 - lib/berkshelf/vagrant/action/set_ui.rb
 - lib/berkshelf/vagrant/action/upload.rb
+- lib/berkshelf/vagrant/action/validate.rb
 - lib/berkshelf/vagrant/config.rb
 - lib/berkshelf/vagrant/middleware.rb
 - lib/berkshelf/version.rb