knife-essentials 0.7.2 → 0.7.3

data/lib/chef_fs/file_pattern.rb

@@ -53,7 +53,7 @@ module ChefFS
     def could_match_children?(path)
       return false if path == '' # Empty string is not a path
 
-      argument_is_absolute = !!(path[0] =~ /^#{ChefFS::PathUtils::regexp_path_separator}/)
+      argument_is_absolute = !!(path =~ /^#{ChefFS::PathUtils::regexp_path_separator}/)
       return false if is_absolute != argument_is_absolute
       path = path[1,path.length-1] if argument_is_absolute
 
@@ -89,10 +89,10 @@ module ChefFS
     #   abc/*/ghi.exact_child_name_under('abc') == nil
     #   abc/*/ghi.exact_child_name_under('abc/def') == 'ghi'
     #   abc/**/ghi.exact_child_name_under('abc/def') == nil
-    # 
+    #
     # This method assumes +could_match_children?(path)+ is +true+.
     def exact_child_name_under(path)
-      path = path[1,path.length-1] if !!(path[0] =~ /^#{ChefFS::PathUtils::regexp_path_separator}/)
+      path = path[1,path.length-1] if !!(path =~ /^#{ChefFS::PathUtils::regexp_path_separator}/)
       dirs_in_path = ChefFS::PathUtils::split(path).length
       return nil if exact_parts.length <= dirs_in_path
       return exact_parts[dirs_in_path]
@@ -130,7 +130,7 @@ module ChefFS
     #   abc/*/def.match?('abc/foo/def') == true
     #   abc/*/def.match?('abc/foo') == false
     def match?(path)
-      argument_is_absolute = !!(path[0] =~ /^#{ChefFS::PathUtils::regexp_path_separator}/)
+      argument_is_absolute = !!(path =~ /^#{ChefFS::PathUtils::regexp_path_separator}/)
       return false if is_absolute != argument_is_absolute
       path = path[1,path.length-1] if argument_is_absolute
       !!regexp.match(path)
@@ -267,15 +267,15 @@ module ChefFS
             exact = nil
             regexp << '.'
           else
-            if part[0] == '\\' && part.length == 2
+            if part[0,1] == '\\' && part.length == 2
               # backslash escapes are only supported on Unix, and are handled here by leaving the escape on (it means the same thing in a regex)
-              exact << part[1] if !exact.nil?
-              if regexp_escape_characters.include?(part[1])
+              exact << part[1,1] if !exact.nil?
+              if regexp_escape_characters.include?(part[1,1])
                 regexp << part
               else
-                regexp << part[1]
+                regexp << part[1,1]
               end
-            elsif part[0] == '[' && part.length > 1
+            elsif part[0,1] == '[' && part.length > 1
               # [...] happens only on Unix, and is handled here by *not* backslashing (it means the same thing in and out of regex)
               exact = nil
               regexp << part
@@ -289,4 +289,4 @@ module ChefFS
       [regexp, exact, has_double_star]
     end
   end
-end
+end

data/lib/chef_fs/file_system/chef_repository_file_system_entry.rb

@@ -40,8 +40,8 @@ module ChefFS
       end
 
       def children
-        @children ||= Dir.entries(file_path).select { |entry| entry != '.' && entry != '..' && !ignored?(entry) }
-                                            .map { |entry| ChefRepositoryFileSystemEntry.new(entry, self) }
+        @children ||= Dir.entries(file_path).select { |entry| entry != '.' && entry != '..' && !ignored?(entry) }.
+                                             map { |entry| ChefRepositoryFileSystemEntry.new(entry, self) }
       end
 
       attr_reader :chefignore

data/lib/chef_fs/file_system/cookbook_dir.rb

@@ -114,21 +114,7 @@ module ChefFS
       end
 
       def copy_from(other)
-        other_cookbook_version = other.chef_object
-        # TODO this only works on the file system.  And it can't be broken into
-        # pieces.
-        begin
-          Chef::CookbookUploader.new(other_cookbook_version, other.parent.file_path).upload_cookbook
-        rescue Net::HTTPServerException => e
-          case e.response.code
-          when "409"
-            ui.error "Version #{cookbook.version} of cookbook #{cookbook.name} is frozen. Use --force to override."
-            Log.debug(e)
-            raise Exceptions::CookbookFrozen
-          else
-            raise
-          end
-        end
+        parent.upload_cookbook_from(other)
       end
 
       def rest

data/lib/chef_fs/file_system/cookbooks_dir.rb

@@ -17,6 +17,28 @@ module ChefFS
         @children ||= rest.get_rest(api_path).map { |key, value| CookbookDir.new(key, self, value) }
       end
 
+      def create_child_from(other)
+        upload_cookbook_from(other)
+      end
+
+      def upload_cookbook_from(other)
+        other_cookbook_version = other.chef_object
+        # TODO this only works on the file system.  And it can't be broken into
+        # pieces.
+        begin
+          Chef::CookbookUploader.new(other_cookbook_version, other.parent.file_path).upload_cookbook
+        rescue Net::HTTPServerException => e
+          case e.response.code
+          when "409"
+            ui.error "Version #{other_cookbook_version.version} of cookbook #{other_cookbook_version.name} is frozen. Use --force to override."
+            Chef::Log.debug(e)
+            raise Exceptions::CookbookFrozen
+          else
+            raise
+          end
+        end
+      end
+
       def can_have_child?(name, is_dir)
         is_dir
       end

data/lib/chef_fs/file_system/file_system_entry.rb

@@ -15,7 +15,7 @@ module ChefFS
       attr_reader :file_path
 
       def path_for_printing
-        ChefFS::PathUtils::relative_to(file_path, File.absolute_path(Dir.pwd))
+        ChefFS::PathUtils::relative_to(file_path, File.expand_path(Dir.pwd))
       end
 
       def children

data/lib/chef_fs/file_system.rb

@@ -53,8 +53,8 @@ module ChefFS
     #
     def self.resolve_path(entry, path)
       return entry if path.length == 0
-      return resolve_path(entry.root, path) if path[0] == "/" && entry.root != entry
-      if path[0] == "/"
+      return resolve_path(entry.root, path) if path[0,1] == "/" && entry.root != entry
+      if path[0,1] == "/"
         path = path[1,path.length-1]
       end
 
@@ -226,6 +226,17 @@ module ChefFS
 
       elsif !dest_entry.exists?
         if new_dest_parent.can_have_child?(src_entry.name, src_entry.dir?)
+          # If the entry can do a copy directly from filesystem, do that.
+          if new_dest_parent.respond_to?(:create_child_from)
+            if options[:dry_run]
+              puts "Would create #{dest_entry.path_for_printing}"
+            else
+              new_dest_parent.create_child_from(src_entry)
+              puts "Created #{dest_entry.path_for_printing}"
+            end
+            return
+          end
+
           if src_entry.dir?
             if options[:dry_run]
               puts "Would create #{dest_entry.path_for_printing}"
@@ -260,7 +271,6 @@ module ChefFS
             if options[:dry_run]
               puts "Would update #{dest_entry.path_for_printing}"
             else
-              puts "Updating #{dest_entry.path_for_printing} ..."
               dest_entry.copy_from(src_entry)
               puts "Updated #{dest_entry.path_for_printing}"
             end

data/lib/chef_fs/knife.rb

@@ -15,7 +15,7 @@ module ChefFS
 
     def base_path
       @base_path ||= begin
-        relative_to_base = ChefFS::PathUtils::relative_to(File.absolute_path(Dir.pwd), chef_repo)
+        relative_to_base = ChefFS::PathUtils::relative_to(File.expand_path(Dir.pwd), chef_repo)
         relative_to_base == '.' ? '/' : "/#{relative_to_base}"
       end
     end
@@ -25,7 +25,7 @@ module ChefFS
     end
 
     def chef_repo
-      @chef_repo ||= File.absolute_path(File.join(Chef::Config.cookbook_path, ".."))
+      @chef_repo ||= File.expand_path(File.join(Chef::Config.cookbook_path, ".."))
     end
 
     def format_path(path)

data/lib/chef_fs/path_utils.rb

@@ -23,7 +23,7 @@ module ChefFS
     def self.join(*parts)
       return "" if parts.length == 0
       # Determine if it started with a slash
-      absolute = parts[0].length == 0 || parts[0].length > 0 && parts[0][0] =~ /^#{regexp_path_separator}/
+      absolute = parts[0].length == 0 || parts[0].length > 0 && parts[0] =~ /^#{regexp_path_separator}/
       # Remove leading and trailing slashes from each part so that the join will work (and the slash at the end will go away)
       parts = parts.map { |part| part.gsub(/^\/|\/$/, "") }
       # Don't join empty bits
@@ -41,4 +41,4 @@ module ChefFS
     end
 
   end
-end
+end

data/lib/chef_fs/version.rb

@@ -1,4 +1,4 @@
 module ChefFS
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000Z
+date: 2012-05-26 00:00:00.000000000Z
 dependencies: []
 description: Universal knife verbs that work with your Chef repository
 email: jkeiser@opscode.com