cheffish 1.6.0 → 2.0.0

data/lib/cheffish.rb

@@ -100,9 +100,9 @@ module Cheffish
         next unless File.exist?(private_key_path)
         Dir.entries(private_key_path).sort.each do |key|
           ext = File.extname(key)
-          if ext == '' || ext == '.pem'
+          if key == name || ext == '' || ext == '.pem'
             key_name = key[0..-(ext.length+1)]
-            if key_name == name
+            if key_name == name || key == name
               Chef::Log.info("Reading key #{name} from file #{private_key_path}/#{key}")
               return [ IO.read("#{private_key_path}/#{key}"), "#{private_key_path}/#{key}" ]
             end
@@ -113,113 +113,8 @@ module Cheffish
     nil
   end
 
-  # `NOT_PASSED` is defined in chef-12.5.0, this guard will ensure we
-  # don't redefine it if it's already there
-  NOT_PASSED=Object.new unless defined?(NOT_PASSED)
-
   def self.node_attributes(klass)
-    klass.class_eval do
-      attribute :name, :kind_of => String, :regex => Cheffish::NAME_REGEX, :name_attribute => true
-      attribute :chef_environment, :kind_of => String, :regex => Cheffish::NAME_REGEX
-      attribute :run_list, :kind_of => Array # We should let them specify it as a series of parameters too
-      attribute :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
-
-      # attribute 'ip_address', '127.0.0.1'
-      # attribute [ 'pushy', 'port' ], '9000'
-      # attribute 'ip_addresses' do |existing_value|
-      #   (existing_value || []) + [ '127.0.0.1' ]
-      # end
-      # attribute 'ip_address', :delete
-      attr_accessor :attribute_modifiers
-      def attribute(attribute_path, value=NOT_PASSED, &block)
-        @attribute_modifiers ||= []
-        if value != NOT_PASSED
-          @attribute_modifiers << [ attribute_path, value ]
-        elsif block
-          @attribute_modifiers << [ attribute_path, block ]
-        else
-          raise "attribute requires either a value or a block"
-        end
-      end
-
-      # Patchy tags
-      # tag 'webserver', 'apache', 'myenvironment'
-      def tag(*tags)
-        attribute 'tags' do |existing_tags|
-          existing_tags ||= []
-          tags.each do |tag|
-            if !existing_tags.include?(tag.to_s)
-              existing_tags << tag.to_s
-            end
-          end
-          existing_tags
-        end
-      end
-      def remove_tag(*tags)
-        attribute 'tags' do |existing_tags|
-          if existing_tags
-            tags.each do |tag|
-              existing_tags.delete(tag.to_s)
-            end
-          end
-          existing_tags
-        end
-      end
-
-      # NON-patchy tags
-      # tags :a, :b, :c # removes all other tags
-      def tags(*tags)
-        if tags.size == 0
-          attribute('tags')
-        else
-          tags = tags[0] if tags.size == 1 && tags[0].kind_of?(Array)
-          attribute 'tags', tags.map { |tag| tag.to_s }
-        end
-      end
-
-      # Order matters--if two things here are in the wrong order, they will be flipped in the run list
-      # recipe 'apache', 'mysql'
-      # recipe 'recipe@version'
-      # recipe 'recipe'
-      # role ''
-      attr_accessor :run_list_modifiers
-      attr_accessor :run_list_removers
-      def recipe(*recipes)
-        if recipes.size == 0
-          raise ArgumentError, "At least one recipe must be specified"
-        end
-        @run_list_modifiers ||= []
-        @run_list_modifiers += recipes.map { |recipe| Chef::RunList::RunListItem.new("recipe[#{recipe}]") }
-      end
-      def role(*roles)
-        if roles.size == 0
-          raise ArgumentError, "At least one role must be specified"
-        end
-        @run_list_modifiers ||= []
-        @run_list_modifiers += roles.map { |role| Chef::RunList::RunListItem.new("role[#{role}]") }
-      end
-      def remove_recipe(*recipes)
-        if recipes.size == 0
-          raise ArgumentError, "At least one recipe must be specified"
-        end
-        @run_list_removers ||= []
-        @run_list_removers += recipes.map { |recipe| Chef::RunList::RunListItem.new("recipe[#{recipe}]") }
-      end
-      def remove_role(*roles)
-        if roles.size == 0
-          raise ArgumentError, "At least one role must be specified"
-        end
-        @run_list_removers ||= []
-        @run_list_removers += roles.map { |role| Chef::RunList::RunListItem.new("role[#{role}]") }
-      end
-    end
+    klass.include Cheffish::NodeProperties
   end
 end
 
@@ -233,3 +128,4 @@ require 'chef/config_fetcher'
 require 'chef/log'
 require 'chef/application'
 require 'cheffish/recipe_dsl'
+require 'cheffish/node_properties'

data/spec/integration/chef_acl_spec.rb

@@ -1,7 +1,5 @@
 require 'support/spec_support'
 require 'cheffish/rspec/chef_run_support'
-require 'chef/resource/chef_acl'
-require 'chef/provider/chef_acl'
 require 'chef_zero/version'
 require 'uri'
 

data/spec/integration/chef_client_spec.rb

@@ -2,7 +2,6 @@ require 'support/spec_support'
 require 'cheffish/rspec/chef_run_support'
 require 'support/key_support'
 require 'chef/resource/chef_client'
-require 'chef/provider/chef_client'
 
 repo_path = Dir.mktmpdir('chef_repo')
 

data/spec/integration/chef_container_spec.rb

@@ -1,7 +1,5 @@
 require 'support/spec_support'
 require 'cheffish/rspec/chef_run_support'
-require 'chef/resource/chef_container'
-require 'chef/provider/chef_container'
 
 describe Chef::Resource::ChefContainer do
   extend Cheffish::RSpec::ChefRunSupport

data/spec/integration/chef_group_spec.rb

@@ -1,7 +1,5 @@
 require 'support/spec_support'
 require 'cheffish/rspec/chef_run_support'
-require 'chef/resource/chef_group'
-require 'chef/provider/chef_group'
 
 describe Chef::Resource::ChefGroup do
   extend Cheffish::RSpec::ChefRunSupport

data/spec/integration/chef_mirror_spec.rb

@@ -1,7 +1,5 @@
 require 'support/spec_support'
 require 'cheffish/rspec/chef_run_support'
-require 'chef/resource/chef_mirror'
-require 'chef/provider/chef_mirror'
 
 describe Chef::Resource::ChefMirror do
   extend Cheffish::RSpec::ChefRunSupport

data/spec/integration/chef_node_spec.rb

@@ -1,7 +1,5 @@
 require 'support/spec_support'
 require 'cheffish/rspec/chef_run_support'
-require 'chef/resource/chef_node'
-require 'chef/provider/chef_node'
 
 describe Chef::Resource::ChefNode do
   extend Cheffish::RSpec::ChefRunSupport

data/spec/integration/chef_organization_spec.rb

@@ -1,7 +1,5 @@
 require 'support/spec_support'
 require 'cheffish/rspec/chef_run_support'
-require 'chef/resource/chef_organization'
-require 'chef/provider/chef_organization'
 
 describe Chef::Resource::ChefOrganization do
   extend Cheffish::RSpec::ChefRunSupport
@@ -195,7 +193,7 @@ describe Chef::Resource::ChefOrganization do
             expect(get('/organizations/x/users').map { |u| u['user']['username'] }).to eq([])
           end
 
-          it 'chef_organization "x" with members [] and "complete true" removes invites but not members' do
+          it 'chef_organization "x" with invites [] and "complete true" removes invites but not members' do
             expect_recipe {
               chef_organization 'x' do
                 invites []

data/spec/integration/chef_role_spec.rb

@@ -1,7 +1,5 @@
 require 'support/spec_support'
 require 'cheffish/rspec/chef_run_support'
-require 'chef/resource/chef_role'
-require 'chef/provider/chef_role'
 
 describe Chef::Resource::ChefRole do
   extend Cheffish::RSpec::ChefRunSupport

data/spec/integration/chef_user_spec.rb

@@ -1,8 +1,6 @@
 require 'support/spec_support'
 require 'cheffish/rspec/chef_run_support'
 require 'support/key_support'
-require 'chef/resource/chef_user'
-require 'chef/provider/chef_user'
 
 repo_path = Dir.mktmpdir('chef_repo')
 

data/spec/integration/private_key_spec.rb

@@ -1,9 +1,5 @@
 require 'support/spec_support'
 require 'cheffish/rspec/chef_run_support'
-require 'chef/resource/private_key'
-require 'chef/provider/private_key'
-require 'chef/resource/public_key'
-require 'chef/provider/public_key'
 require 'support/key_support'
 
 repo_path = Dir.mktmpdir('chef_repo')

data/spec/integration/recipe_dsl_spec.rb

@@ -1,7 +1,5 @@
 require 'support/spec_support'
 require 'cheffish/rspec/chef_run_support'
-require 'chef/resource/chef_node'
-require 'chef/provider/chef_node'
 require 'tmpdir'
 
 describe 'Cheffish Recipe DSL' do

data/spec/support/spec_support.rb

@@ -1,7 +1,6 @@
 require 'cheffish/rspec'
 
 require 'cheffish'
-require 'chef/provider/chef_acl'
 
 RSpec.configure do |config|
   config.filter_run :focus => true

data/spec/unit/get_private_key_spec.rb

@@ -26,6 +26,14 @@ describe Cheffish do
     key_file
   end
 
+  def setup_arbitrarily_named_key
+    key_file = File.expand_path("ned_stark.xxx", directory_that_exists)
+    File.open(key_file, "w+") do |f|
+      f.write private_key_contents
+    end
+    key_file
+  end
+
   def setup_pem_key
     key_file = File.expand_path("ned_stark.pem", directory_that_exists)
     File.open(key_file, "w+") do |f|
@@ -57,6 +65,11 @@ describe Cheffish do
       expect(Cheffish.get_private_key("ned_stark", config)).to eq(private_key_pem_contents)
     end
 
+    it "returns the contents of arbitrarily named keys" do
+      setup_arbitrarily_named_key
+      expect(Cheffish.get_private_key("ned_stark.xxx", config)).to eq(private_key_contents)
+    end
+
     # we arbitrarily prefer "ned_stark" over "ned_stark.pem" for deterministic behavior
     it "returns the contents of the key that does not have an extension if both exist" do
       setup_key

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheffish
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.0.0
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.3'
+- !ruby/object:Gem::Dependency
+  name: compat_resource
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
@@ -79,21 +93,6 @@ files:
 - README.md
 - Rakefile
 - cheffish.gemspec
-- lib/chef/provider/chef_acl.rb
-- lib/chef/provider/chef_client.rb
-- lib/chef/provider/chef_container.rb
-- lib/chef/provider/chef_data_bag.rb
-- lib/chef/provider/chef_data_bag_item.rb
-- lib/chef/provider/chef_environment.rb
-- lib/chef/provider/chef_group.rb
-- lib/chef/provider/chef_mirror.rb
-- lib/chef/provider/chef_node.rb
-- lib/chef/provider/chef_organization.rb
-- lib/chef/provider/chef_resolved_cookbooks.rb
-- lib/chef/provider/chef_role.rb
-- 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_container.rb
@@ -110,14 +109,16 @@ files:
 - lib/chef/resource/private_key.rb
 - lib/chef/resource/public_key.rb
 - lib/cheffish.rb
-- lib/cheffish/actor_provider_base.rb
+- lib/cheffish/array_property.rb
+- lib/cheffish/base_resource.rb
 - lib/cheffish/basic_chef_client.rb
-- lib/cheffish/chef_provider_base.rb
+- lib/cheffish/chef_actor_base.rb
 - lib/cheffish/chef_run.rb
 - lib/cheffish/chef_run_data.rb
 - lib/cheffish/chef_run_listener.rb
 - lib/cheffish/key_formatter.rb
 - lib/cheffish/merged_config.rb
+- lib/cheffish/node_properties.rb
 - lib/cheffish/recipe_dsl.rb
 - lib/cheffish/rspec.rb
 - lib/cheffish/rspec/chef_run_support.rb
@@ -169,8 +170,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A library to manipulate Chef in Chef.
 test_files: []
+has_rdoc: