cheffish 0.7 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e58ebae3c3b7856ae29da6639debd75b93d1a2ba
-  data.tar.gz: 278ba389ad45a85bdc19dc9875c88da1084b832a
+  metadata.gz: ede81f8d16044c52e057959e600456f20c3a3b25
+  data.tar.gz: ec1c78fbef404e83ff691825949f0111e7f962ec
 SHA512:
-  metadata.gz: 225c6e83fc286c34a7d1272a3ae53cb02b25ed3168f231ec0315772e3195f492676d011af44d846c0725d79efe2fb97f91f83d9d83207f1908427fad328910a6
-  data.tar.gz: 165ab945e54d38c2e2173b71ac1584eab0d4b613f46c0402aa6dcc2fcb09635b3ae0d4c341d4de13493d36ab9319cc84b347a6996db53b5bc9135b33c0965ff8
+  metadata.gz: 9c87bd23e659677f0c3917d6bf75b153edb29abb4f00e0298daf0b15b514853452f4c876a46f55062320a05066f7ff99047514e352901502fabd0787635e106a
+  data.tar.gz: 46e4d256b1c534875ba01bc86a0fc7f3537fa19bd03b04f522cc022b87be6efac3d5b1568eed249745bf5c024954ccb16d32743dfed7dc6fa26908ccd0ee6619

data/lib/chef/resource/chef_acl.rb

@@ -0,0 +1,71 @@
+require 'cheffish'
+require 'chef/resource/lwrp_base'
+require 'chef/environment'
+
+class Chef::Resource::ChefAcl < Chef::Resource::LWRPBase
+  self.resource_name = 'chef_acl'
+
+  actions :create, :delete, :nothing
+  default_action :create
+
+  def initialize(*args)
+    super
+    chef_server run_context.cheffish.current_chef_server
+  end
+
+  attribute :name, :kind_of => String, :regex => Cheffish::NAME_REGEX, :name_attribute => true
+  attribute :description, :kind_of => String
+  attribute :cookbook_versions, :kind_of => Hash, :callbacks => {
+    "should have valid cookbook versions" => lambda { |value| Chef::Environment.validate_cookbook_versions(value) }
+  }
+  attribute :default_attributes, :kind_of => Hash
+  attribute :override_attributes, :kind_of => Hash
+
+  # Specifies that this is a complete specification for the environment (i.e. attributes you don't specify will be
+  # reset to their defaults)
+  attribute :complete, :kind_of => [TrueClass, FalseClass]
+
+  attribute :raw_json, :kind_of => Hash
+  attribute :chef_server, :kind_of => Hash
+
+  NOT_PASSED=Object.new
+
+  # default 'ip_address', '127.0.0.1'
+  # default [ 'pushy', 'port' ], '9000'
+  # default 'ip_addresses' do |existing_value|
+  #   (existing_value || []) + [ '127.0.0.1' ]
+  # end
+  # default 'ip_address', :delete
+  attr_reader :default_attribute_modifiers
+  def default(attribute_path, value=NOT_PASSED, &block)
+    @default_attribute_modifiers ||= []
+    if value != NOT_PASSED
+      @default_attribute_modifiers << [ attribute_path, value ]
+    elsif block
+      @default_attribute_modifiers << [ attribute_path, block ]
+    else
+      raise "default requires either a value or a block"
+    end
+  end
+
+  # override 'ip_address', '127.0.0.1'
+  # override [ 'pushy', 'port' ], '9000'
+  # override 'ip_addresses' do |existing_value|
+  #   (existing_value || []) + [ '127.0.0.1' ]
+  # end
+  # override 'ip_address', :delete
+  attr_reader :override_attribute_modifiers
+  def override(attribute_path, value=NOT_PASSED, &block)
+    @override_attribute_modifiers ||= []
+    if value != NOT_PASSED
+      @override_attribute_modifiers << [ attribute_path, value ]
+    elsif block
+      @override_attribute_modifiers << [ attribute_path, block ]
+    else
+      raise "override requires either a value or a block"
+    end
+  end
+
+  alias :attributes :default_attributes
+  alias :attribute :default
+end

data/lib/cheffish.rb

@@ -64,12 +64,18 @@ module Cheffish
     if Chef::Config.local_mode && !Chef::Config.has_key?(:cookbook_path) && !Chef::Config.has_key?(:chef_repo_path)
       Chef::Config.chef_repo_path = Chef::Config.find_chef_repo_path(Dir.pwd)
     end
-    Chef::Application.setup_server_connectivity
-    if block_given?
-      begin
-        yield
-      ensure
-        Chef::Application.destroy_server_connectivity
+    begin
+      require 'chef/local_mode'
+      Chef::LocalMode.with_server_connectivity(&block)
+
+    rescue LoadError
+      Chef::Application.setup_server_connectivity
+      if block_given?
+        begin
+          yield
+        ensure
+          Chef::Application.destroy_server_connectivity
+        end
       end
     end
   end

data/lib/cheffish/version.rb

@@ -1,3 +1,3 @@
 module Cheffish
-  VERSION = '0.7'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheffish
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: 0.7.1
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -77,6 +77,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- lib/chef/provider/chef_acl.rb
 - lib/chef/provider/chef_client.rb
 - lib/chef/provider/chef_data_bag.rb
 - lib/chef/provider/chef_data_bag_item.rb
@@ -87,6 +88,7 @@ files:
 - lib/chef/provider/chef_user.rb
 - lib/chef/provider/private_key.rb
 - lib/chef/provider/public_key.rb
+- lib/chef/resource/chef_acl.rb
 - lib/chef/resource/chef_client.rb
 - lib/chef/resource/chef_data_bag.rb
 - lib/chef/resource/chef_data_bag_item.rb