berkshelf 0.5.0.rc3 → 0.5.0.rc4

data/berkshelf.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.version               = Berkshelf::VERSION
   s.required_ruby_version = ">= 1.9.1"
 
-  s.add_runtime_dependency 'ridley',  '>= 0.0.4'
+  s.add_runtime_dependency 'ridley',  '>= 0.0.5'
   s.add_runtime_dependency 'solve',   '~> 0.2.1'
   s.add_runtime_dependency 'chef',    '~> 10.12.0'
   s.add_runtime_dependency 'minitar'

data/lib/berkshelf/berksfile.rb

@@ -379,6 +379,7 @@ module Berkshelf
     # @option options [URI, String, Hash] :proxy
     #   URI, String, or Hash of HTTP proxy options
     def upload(options = {})
+      options[:organization] ||= ChefAPILocation.extract_organization(Chef::Config[:chef_server_url])
       uploader = Uploader.new(options)
       solution = resolve(options)
 

data/lib/berkshelf/cli.rb

@@ -120,7 +120,6 @@ 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]),
         ssl: {
           verify: options[:ssl_verify]
         }

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

@@ -12,13 +12,12 @@ module Berkshelf
           @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
+          @ssl_verify = env[:global_config].berkshelf.ssl_verify
           @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
 

data/lib/berkshelf/vagrant/config.rb

@@ -2,70 +2,60 @@ 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]
       #   path to a knife configuration file
-      def config_path
-        @config_path ||= Berkshelf::DEFAULT_CONFIG
-      end
-
-      # @param [String] value
-      def config_path=(value)
-        @config_path = File.expand_path(value)
-      end
+      attr_reader :config_path
 
       # @return [String]
       #   path to the Berksfile to use with Vagrant
-      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
+      attr_reader :berksfile_path
 
       # @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.
       attr_accessor :node_name
 
+      # @return [Array<Symbol>]
+      #   only cookbooks in these groups will be installed and copied to
+      #   Vagrant's shelf
+      attr_accessor :only
+
       # @return [Array<Symbol>]
       #   cookbooks in all other groups except for these will be installed
       #   and copied to Vagrant's shelf
-      def except
-        @except ||= Array.new
+      attr_accessor :except
+      attr_accessor :ssl_verify
+
+      def initialize
+        @berksfile_path = File.join(Dir.pwd, Berkshelf::DEFAULT_FILENAME)
+        @config_path    = Berkshelf::DEFAULT_CONFIG
+        @node_name      = nil
+        @client_key     = nil
+        @except         = Array.new
+        @only           = Array.new
+        @ssl_verify     = true
       end
-      attr_writer :except
 
-      # @return [Array<Symbol>]
-      #   only cookbooks in these groups will be installed and copied to
-      #   Vagrant's shelf
-      def only
-        @only ||= Array.new
+      # @param [String] value
+      def berksfile_path=(value)
+        @berksfile_path = File.expand_path(value)
       end
-      attr_writer :only
 
-      # @return [Boolean]
-      #   should connections to a Chef API use SSL verification
-      def ssl_verify
-        @ssl_verify ||= true
+      # @param [String] value
+      def config_path=(value)
+        @config_path = File.expand_path(value)
+      end
+
+      # @param [String] value
+      def client_key=(value)
+        @client_key = File.expand_path(value)
       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.rc3"
+  VERSION = "0.5.0.rc4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 0.5.0.rc3
+  version: 0.5.0.rc4
   prerelease: 6
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-21 00:00:00.000000000 Z
+date: 2012-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ridley
@@ -21,7 +21,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: solve
   requirement: !ruby/object:Gem::Requirement