lib/berkshelf/config.rb in berkshelf-1.1.6 vs lib/berkshelf/config.rb in berkshelf-1.2.0.rc1

@@ -1,22 +1,13 @@
 require 'chozo/config'
 
 module Berkshelf
-  # @author Justin Campbell <[e-mail]>
-  # @author Jamie Winsor <[e-mail]>
+  # @author Justin Campbell <[e-mail]>
+  # @author Jamie Winsor <[e-mail]>
   class Config < Chozo::Config::JSON
     FILENAME = "config.json".freeze
 
-    # List taken from: http://wiki.opscode.com/display/chef/Chef+Configuration+Settings
-    # Listed in order of preferred preference
-    KNIFE_LOCATIONS = [
-      './.chef/knife.rb',
-      '~/.chef/knife.rb',
-      '/etc/chef/solo.rb',
-      '/etc/chef/client.rb'
-    ].freeze
-
     class << self
       # @return [String]
       def path
         @path || File.join(Berkshelf.berkshelf_path, FILENAME)
       end
@@ -25,44 +16,10 @@
       def path=(new_path)
         @path = File.expand_path(new_path)
       end
 
       # @return [String, nil]
-      def chef_config_path
-        @chef_config_path ||= begin
-          possibles = KNIFE_LOCATIONS.dup
-
-          unless ENV['BERKSHELF_CHEF_CONFIG'].nil?
-            possibles.unshift(ENV['BERKSHELF_CHEF_CONFIG'])
-          end
-
-          location = possibles.find do |location|
-            File.exists?(File.expand_path(location))
-          end
-          location ||= "~/.chef/knife.rb"
-
-          File.expand_path(location)
-        end
-      end
-
-      # @param [String] value
-      def chef_config_path=(value)
-        @chef_config = nil
-        @chef_config_path = value
-      end
-
-      # @return [Chef::Config]
-      def chef_config
-        @chef_config ||= begin
-          Chef::Config.from_file(File.expand_path(chef_config_path))
-          Chef::Config
-        rescue
-          Chef::Config
-        end
-      end
-
-      # @return [String, nil]
       #   the contents of the file
       def file
         File.read(path) if File.exists?(path)
       end
 
@@ -94,22 +51,31 @@
       super(path, options)
     end
 
     attribute 'chef.chef_server_url',
       type: String,
-      default: chef_config[:chef_server_url]
+      default: Berkshelf::Chef::Config.instance[:chef_server_url]
     attribute 'chef.validation_client_name',
       type: String,
-      default: chef_config[:validation_client_name]
+      default: Berkshelf::Chef::Config.instance[:validation_client_name]
     attribute 'chef.validation_key_path',
       type: String,
-      default: chef_config[:validation_key]
+      default: Berkshelf::Chef::Config.instance[:validation_key]
     attribute 'chef.client_key',
       type: String,
-      default: chef_config[:client_key]
+      default: Berkshelf::Chef::Config.instance[:client_key]
     attribute 'chef.node_name',
       type: String,
-      default: chef_config[:node_name]
+      default: Berkshelf::Chef::Config.instance[:node_name]
+    attribute 'cookbook.copyright',
+      type: String,
+      default: Berkshelf::Chef::Config.instance[:cookbook_copyright]
+    attribute 'cookbook.email',
+      type: String,
+      default: Berkshelf::Chef::Config.instance[:cookbook_email]
+    attribute 'cookbook.license',
+      type: String,
+      default: Berkshelf::Chef::Config.instance[:cookbook_license]
     attribute 'vagrant.vm.box',
       type: String,
       default: 'Berkshelf-CentOS-6.3-x86_64-minimal',
       required: true
     attribute 'vagrant.vm.box_url',