knife-scrub 0.1.2 → 0.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZjE4YjEwNjRhOTU0ZTNhYzcyNGJkOGE1Njk4MWNlMDRkMWU5M2QyNA==
+  data.tar.gz: !binary |-
+    ZjQzYjQxYTg5NGMwZWI0N2JjY2M3MmRmZDM1ODkyYTZjMjI4MjZkZQ==
+SHA512:
+  metadata.gz: !binary |-
+    NjNiY2MwMzk4Nzk1NzcxZTRlMDAwOGQxZWUxYzQ3YWU1M2U1ZTBjYTcwYWNi
+    YzA2NTA1YzZiMTAwNDc2MjIzMmU4OTM0YzE3Yzk1ZDQ5ZGNjZDM4MWIyMTcw
+    YzU2YTRlNDA0YTMxMjBkMWIzYzA4NTJhYzg2NjhkYTI5NWQ0Zjc=
+  data.tar.gz: !binary |-
+    MWMzZTJiOTUyMGYyZmEyZjc5YTk3YjZlNTJiZjI3NDI3YmNlYzdlYjc5NGIw
+    ZDZmZjM2MTM1ZTk4MmZjNzU1OWFkYzk5YmNiMDg3MjYzM2NjMzY2NDkyZjdm
+    ZWFmNzBkNmI0NTkwMjI2ZGE1NWRlMzczNzdiM2IwN2FmODJmMzY=

data/lib/chef/knife/scrub/attribute_extractor.rb

@@ -0,0 +1,116 @@
+#
+# Author:: Tobias Schmidt (<ts@soundcloud.com>)
+# Copyright:: Copyright (c) 2013 SoundCloud, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+class Chef
+  class Knife
+    module Scrub
+      class AttributeExtractor
+
+        class Base
+          def initialize(node, precedence)
+            @node = node
+            @precedence = precedence
+          end
+
+          def has_key?(key)
+            raise NotImplementedError
+          end
+
+          def fetch(key)
+            raise NotImplementedError
+          end
+
+          def delete(key)
+            raise NotImplementedError
+          end
+
+        protected
+
+          def attributes
+            @node.send(@precedence)
+          end
+
+          def extract(data, nested_value_spec)
+            spec = nested_value_spec.split(".")
+            key = spec.pop
+            spec.each do |attr|
+              if data.nil?
+                nil # don't get no method error on nil
+              elsif data.respond_to?(attr.to_sym)
+                data = data.send(attr.to_sym)
+              elsif data.respond_to?(:[])
+                data = data[attr]
+              else
+                data = begin
+                  data.send(attr.to_sym)
+                rescue NoMethodError
+                  nil
+                end
+              end
+            end
+            [data, key]
+          end
+
+        end
+
+        class Simple < Base
+          def has_key?(path)
+            base, key = extract(attributes, path)
+            !base.nil? && base.has_key?(key)
+          end
+
+          def fetch(path)
+            base, key = extract(attributes, path)
+            base.fetch(key)
+          end
+
+          def delete(path)
+            base, key = extract(attributes, path)
+            base.delete(key)
+          end
+        end
+
+        class Weird < Base
+          def has_key?(path)
+            base, key = extract(attributes, path)
+            !base.nil? && base.component_has_key?(base.send(@precedence), key)
+          end
+
+          def fetch(path)
+            base, key = extract(attributes, path)
+            base.value_at_current_nesting(base.send(@precedence), key).fetch(key)
+          end
+
+          def delete(path)
+            base, key = extract(attributes, path)
+            base.delete_from_component(base.send(@precedence), key)
+          end
+        end
+
+        def self.create(node, precedence = :normal)
+          if node.attribute.respond_to?(:component_has_key?)
+            Weird.new(node, precedence)
+          else
+            Simple.new(node, precedence)
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/chef/knife/scrub_attributes.rb

@@ -27,6 +27,7 @@ class Chef
 
       deps do
         require 'chef/search/query'
+        require 'chef/knife/scrub/attribute_extractor'
       end
 
       option :query,
@@ -44,19 +45,19 @@ class Chef
 
         search = Chef::Search::Query.new
         search.search('node', config[:query]) do |node|
-          parent, key = extract(node.normal, prefix)
+          extractor = Scrub::AttributeExtractor.create(node)
 
-          unless parent && parent.component_has_key?(parent.normal, key)
+          unless extractor.has_key?(prefix)
             ui.msg format(node, "unknown normal attribute #{prefix}")
             next
           end
 
-          value = parent.value_at_current_nesting(parent.normal, key).fetch(key)
+          value = extractor.fetch(prefix)
           unless ui.confirm format(node, "Do you want to delete #{value.inspect}")
             next
           end
 
-          if deleted = parent.delete_from_component(parent.normal, key)
+          if deleted = extractor.delete(prefix)
             node.save
             ui.msg format(node, "deleted normal attribute #{deleted.inspect}")
           else
@@ -71,27 +72,6 @@ class Chef
         "#{ui.color(node.fqdn, :cyan)}: #{text}"
       end
 
-      def extract(data, nested_value_spec)
-        spec = nested_value_spec.split(".")
-        key = spec.pop
-        spec.each do |attr|
-          if data.nil?
-            nil # don't get no method error on nil
-          elsif data.respond_to?(attr.to_sym)
-            data = data.send(attr.to_sym)
-          elsif data.respond_to?(:[])
-            data = data[attr]
-          else
-            data = begin
-              data.send(attr.to_sym)
-            rescue NoMethodError
-              nil
-            end
-          end
-        end
-        [data, key]
-      end
-
     end
   end
 end

data/lib/knife-scrub/version.rb

@@ -18,7 +18,7 @@
 
 module Knife
   module Scrub
-    VERSION = '0.1.2'
+    VERSION = '0.2.0'
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: knife-scrub
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Tobias Schmidt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-17 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -56,37 +51,31 @@ files:
 - README.md
 - Rakefile
 - knife-scrub.gemspec
+- lib/chef/knife/scrub/attribute_extractor.rb
 - lib/chef/knife/scrub_attributes.rb
 - lib/knife-scrub/version.rb
 homepage: https://github.com/soundcloud/knife-scrub
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1430354937757579316
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1430354937757579316
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: knife plugin to scrub normal attributes of chef-server
 test_files: []