af 0.3.18.7 → 0.3.18.8

data/lib/cli/commands/apps.rb

@@ -478,31 +478,6 @@ module VMC::Cli::Command
       err "Can't deploy applications from staging directory: [#{Dir.tmpdir}]"
     end
 
-    def check_unreachable_links(path)
-      files = Dir.glob("#{path}/**/*", File::FNM_DOTMATCH)
-
-      pwd = Pathname.pwd
-
-      abspath = File.expand_path(path)
-      unreachable = []
-      files.each do |f|
-        file = Pathname.new(f)
-        if file.symlink? && !file.realpath.to_s.start_with?(abspath)
-          unreachable << file.relative_path_from(pwd)
-        end
-      end
-
-      unless unreachable.empty?
-        root = Pathname.new(path).relative_path_from(pwd)
-        err "Can't deploy application containing links '#{unreachable}' that reach outside its root '#{root}'"
-      end
-    end
-
-    def find_sockets(path)
-      files = Dir.glob("#{path}/**/*", File::FNM_DOTMATCH)
-      files && files.select { |f| File.socket? f }
-    end
-    
     def upload_app_bits(appname, path, infra)
       display 'Uploading Application:'
 
@@ -527,25 +502,20 @@ module VMC::Cli::Command
           elsif zip_file = Dir.glob('*.zip').first
             VMC::Cli::ZipUtil.unpack(zip_file, explode_dir)
           else
-            check_unreachable_links(path)
             FileUtils.mkdir(explode_dir)
 
-            files = Dir.glob('{*,.[^\.]*}')
+            afi = VMC::Cli::FileHelper::AppFogIgnore.from_file("#{path}")
 
-            # Do not process .git files
-            files.delete('.git') if files
-            
-            files = afignore("#{path}/.afignore",files)
-            
-            FileUtils.cp_r(files, explode_dir)
+            files = Dir.glob("#{path}/**/*", File::FNM_DOTMATCH)
+            check_unreachable_links(path,afi.included_files(files))
 
-            find_sockets(explode_dir).each do |s|
-              File.delete s
-            end
+            copy_files( path, ignore_sockets( afi.included_files(files)), explode_dir )
+            
           end
         end
       end
 
+
       # Send the resource list to the cloudcontroller, the response will tell us what it already has..
       unless @options[:noresources]
         display '  Checking for available resources: ', false

data/lib/cli/file_helper.rb

@@ -1,46 +1,125 @@
 module VMC::Cli
   module FileHelper
     
-    
-    def match(pattern,filename)
-      return false if pattern =~ /^\s*$/ # ignore blank lines
+    class AppFogIgnore
       
-      return false if pattern =~ /^#/ # lines starting with # are comments
+      def initialize(patterns,project_root = "")
+        @patterns = patterns + [ ".git/" ]
+        @project_root = project_root
+      end
       
-      if pattern =~ /\/$/ 
-        # pattern ending in a slash should ignore directory and all its children
-        dirname = pattern.sub(/\/$/,'')
-        return filename == dirname || filename =~ /#{dirname}\/.*$/
+      def included_files(filenames)
+        exclude_dots_only(filenames).reject do |filename|
+          exclude = false
+          @patterns.each do |pattern|
+            if is_negative_pattern?(pattern)
+              exclude = false if negative_match(pattern,filename)
+            else
+              exclude ||= match(pattern,filename)
+            end
+          end
+          exclude
+        end
       end
       
-      if pattern =~ /^!/
-        return !match(pattern.sub(/^!/,''),filename)
+      def exclude_dots_only(filenames)
+        filenames.reject do |filename|
+          base = File.basename(filename)
+          base == "." || base == ".."
+        end
       end
+
       
-      if pattern =~ /^\//
-        parts = filename.split('/')
-        return File.fnmatch(pattern.sub(/^\//,''),parts[0])
+      
+      def excluded_files(filenames)
+        filenames - included_files(filenames)
+      end
+
+      def self.from_file(project_root)
+        f = "#{project_root}/.afignore"
+        if File.exists?(f) 
+          contents = File.read(f).split("\n")
+          AppFogIgnore.new(contents,project_root)
+        else
+          AppFogIgnore.new([],project_root)
+        end
       end
+
+      def match(pattern,filename)
+
+        filename = filename.sub(/^#{@project_root}\//,'') # remove any project directory prefix
+
+        return false if pattern =~ /^\s*$/ # ignore blank lines
+
+        return false if pattern =~ /^#/ # lines starting with # are comments
+
+        return false if pattern =~ /^!/ # lines starting with ! are negated
       
-      if pattern.include? '/'
-        return File.fnmatch(pattern,filename)
+        if pattern =~ /\/$/ 
+          # pattern ending in a slash should ignore directory and all its children
+          dirname = pattern.sub(/\/$/,'')
+          return filename == dirname || filename =~ /#{dirname}\/.*$/
+        end
+      
+        if pattern =~ /^\//
+          parts = filename.split('/')
+          return File.fnmatch(pattern.sub(/^\//,''),parts[0])
+        end
+      
+        if pattern.include? '/'
+          return File.fnmatch(pattern,filename)
+        end
+      
+        File.fnmatch(pattern,filename,File::FNM_PATHNAME)
+      end
+    
+      def is_negative_pattern?(pattern)
+        pattern =~ /^!/
+      end
+    
+      def negative_match(pattern,filename)
+        return false unless pattern =~ /^!/
+        match(pattern.sub(/^!/,''),filename)
       end
       
-      File.fnmatch(pattern,filename,File::FNM_PATHNAME)
     end
     
-    def reject_patterns(patterns,filenames)
-      filenames.reject do |filename|
-        patterns.detect { |pattern| match(pattern,filename)} != nil
+    def ignore_sockets(files)
+      files.reject { |f| File.socket? f }
+    end
+    
+    def check_unreachable_links(path,files)
+      pwd = Pathname.new(path)
+      abspath = pwd.realpath.to_s
+      unreachable = []
+      files.each do |f|
+        file = Pathname.new(f)
+        if file.symlink? && !file.realpath.to_s.start_with?(abspath)
+          unreachable << file.relative_path_from(pwd).to_s
+        end
+      end
+
+      unless unreachable.empty?
+        root = pwd.relative_path_from(pwd).to_s
+        err "Can't deploy application containing links '#{unreachable.join(",")}' that reach outside its root '#{root}'"
       end
     end
 
-    def afignore(ignore_path,files)
-      if File.exists?(ignore_path) 
-        patterns = File.read(ignore_path).split("\n")
-        reject_patterns(patterns,files)
-      else
-        files
+    def copy_files(project_root,files,dest_dir)
+      project_root = Pathname.new(project_root)
+      files.reject { |f| File.symlink?(f) }.each do |f|
+        dest = Pathname.new(f).relative_path_from(project_root)
+        if File.directory?(f)
+          FileUtils.mkdir_p("#{dest_dir}/#{dest}")
+        else
+          FileUtils.cp(f,"#{dest_dir}/#{dest}")
+        end
+      end      
+      root = Pathname.new(project_root).realpath
+      files.select { |f| File.symlink?(f) }.each do |f|
+        dest = Pathname.new(f).relative_path_from(project_root)
+        p = Pathname.new(f).realpath
+        FileUtils.ln_s(p.relative_path_from(root),"#{dest_dir}/#{dest}")
       end
     end
     

data/lib/cli/version.rb

@@ -2,6 +2,6 @@ module VMC
   module Cli
     # This version number is used as the RubyGem release version.
     # The internal VMC version number is VMC::VERSION.
-    VERSION = '0.3.18.7' 
+    VERSION = '0.3.18.8' 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: af
 version: !ruby/object:Gem::Version
-  version: 0.3.18.7
+  version: 0.3.18.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2012-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure