dev 1.0.37 → 1.0.38

data/lib/dev/Project.rb

@@ -14,7 +14,7 @@ class Project < Hash
  
   def array_method(name)
     string_name=name.to_s
-    #puts_debug "method_missing name=" + string_name
+    puts_debug "method_missing name=" + string_name
     
     puts "  no directives defined for #{string_name}" if self.get_value(string_name).nil? && string_name=="pull"
     return if(self.get_value(string_name).nil?)
@@ -73,8 +73,15 @@ class Project < Hash
   def add
     unless self[:src_glob].nil?
       scm = Dev::Scm.new
-      puts "  adding files " + self[:src_glob].to_s
-      scm.add_file_glob(self[:src_glob])
+      if self[:src_glob].kind_of?(Hash)
+        self[:src_glob].each do |name,value|
+          puts "  adding files " + value.to_s
+          scm.add_file_glob(value)
+        end
+      else
+        puts "  adding files " + self[:src_glob].to_s
+        scm.add_file_glob(self[:src_glob])
+      end
     end
   end
   
@@ -257,7 +264,15 @@ class Project < Hash
   
     if key=="file_count" 
       unless Dir.glob(self[:src_glob]).nil?
-        value=Dir.glob(self[:src_glob]).length.to_s
+        if self[:src_glob].kind_of?(Hash)
+          length=0
+          src_glob.each do |name,value|
+            length+=Dir.glob(value).length
+          end
+          value=length.to_s
+        else
+          value=Dir.glob(self[:src_glob]).length.to_s
+        end
       end
     end
     

data/lib/dev/Scm.rb

@@ -18,7 +18,14 @@ class Scm
   
   def add_file(file)
     call=Dev::SystemCall.new("git add #{file}") if @scm_type=="git"
-    call=Dev::SystemCall.new("svn add #{file}") if @scm_type=="svn"
+    
+    if @scm_type=="svn"
+      call=Dev::SystemCall.new("svn info #{file}")
+      if(call.status != 0)
+        call=Dev::SystemCall.new("svn add #{file} --parents")
+        call.puts_summary
+      end
+    end
   end
   
   def add_file_glob(glob)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 1.0.37
+  version: 1.0.38
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &25064352 !ruby/object:Gem::Requirement
+  requirement: &28513092 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25064352
+  version_requirements: *28513092
 - !ruby/object:Gem::Dependency
   name: semver
-  requirement: &25064076 !ruby/object:Gem::Requirement
+  requirement: &28512768 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25064076
+  version_requirements: *28512768
 - !ruby/object:Gem::Dependency
   name: countloc
-  requirement: &25063824 !ruby/object:Gem::Requirement
+  requirement: &28512468 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25063824
+  version_requirements: *28512468
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &25063572 !ruby/object:Gem::Requirement
+  requirement: &28512048 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25063572
+  version_requirements: *28512048
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &25063320 !ruby/object:Gem::Requirement
+  requirement: &28511496 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25063320
+  version_requirements: *28511496
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &25063068 !ruby/object:Gem::Requirement
+  requirement: &28511244 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25063068
+  version_requirements: *28511244
 description: development tasks
 email: lou.parslow@gmail.com
 executables: