dev 1.0.15 → 1.0.16

data/lib/dev/Dep.rb

@@ -48,7 +48,7 @@ class Dep < Hash
   def get_export_command(local_dir)
     unless self[:uri].nil?
       uri=Dev::Environment.expand_string_variables(self.get_value("uri"))
-      return "svn export #{uri} #{local_dir}"
+      return "<%Dev::Scm::export('#{uri}','#{local_dir}') unless File.exists?('#{local_dir}')%>"
     end # unless    
   end
   
@@ -58,7 +58,7 @@ class Dep < Hash
   
   def setup_commands
     array = Array.new
-    array << "<%SystemCall.new('#{get_export_command(get_dep_dir)}') unless File.exists?('#{get_dep_dir}')%>"
+    array << get_export_command(get_dep_dir)
     array << "<%puts ' #{get_dep_dir} exists.' if File.exist?('#{get_dep_dir}')%>"
     
     unless self[:rake].nil?

data/lib/dev/Project.rb

@@ -14,15 +14,17 @@ class Project < Hash
  
   def array_method(name)
     string_name=name.to_s
-    puts_debug "method_missing name=" + string_name
-    if(self.get_value(string_name).nil? || self.get_value(string_name).length < 1)
-      puts_debug "no directives defined for method #{string_name}"
-      return
-    end
-    puts_debug "found directives for #{string_name}: #{self.get_value(string_name).to_s}"
+    #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?)
+    puts "  no directives defined for #{string_name}" if self.get_value(string_name).length < 1
+    return if self.get_value(string_name).length < 1
+    
     self.get_value(string_name).each{ |c|
       # expand the command here....
       command=expand_command(c)
+      puts_debug "command: " + command
       if c.include?('<%') && c.include?('%>')
         #puts "Command: " + c
         eval(c.gsub("<%","").gsub("%>",""))
@@ -132,18 +134,12 @@ class Project < Hash
   end
   
   def has_diff
-    puts_debug "found .svn directory" if File.exists?(".svn")
     call=nil
     call=Dev::SystemCall.new('git diff') if File.exists?(".git")
     call=Dev::SystemCall.new('svn diff') if File.exists?(".svn")
     unless call.nil? || call.output.length==0
-      puts_debug "call command: " + call.command unless call.nil?
-      puts_debug "diff output: " + call.output unless call.nil?
       return true  # differences detected
     else
-     puts_debug "call is nil" if call.nil?
-     puts_debug "call command: " + call.command unless call.nil?
-     puts_debug "diff output: " + call.output unless call.nil?
      return false  # no differences
     end
   end

data/lib/dev/Scm.rb

@@ -7,6 +7,7 @@ class Scm
     @scm_type="svn" if File.exists?(".svn")
     @scm_type="git" if File.exists?(".git")
   end
+  
   def file_tracked?(file)
     if @scm_type=="git"
       call=Dev::SystemCall.new("git ls-files #{file} -error_unmatch")
@@ -14,5 +15,14 @@ class Scm
     end
     false
   end
+  
+  def self.export(remote,local)
+    puts_debug "Scm.export, scm_type=#{@scm_type}"
+    if remote.include?("svn:")
+      local_tmp=local.gsub('@','-')
+      call=Dev::SystemCall.new("svn export #{remote} #{local_tmp}")
+      File.rename(local_tmp,local) if File.exist?(local_tmp)
+    end
+  end
 end # class Scm
 end # module Dev

data/lib/dev/SystemCall.rb

@@ -76,6 +76,8 @@ class SystemCall
       load_cache
       return
     end
+    puts_debug "SystemCall.execute"
+    puts_debug "  " + @command
     @start_time=Time.now
     filename=Dir.tmpdir + "/" + (0...8).map{65.+(rand(25)).chr}.join
     begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.16
   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: &23359488 !ruby/object:Gem::Requirement
+  requirement: &22307916 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23359488
+  version_requirements: *22307916
 - !ruby/object:Gem::Dependency
   name: semver
-  requirement: &23358828 !ruby/object:Gem::Requirement
+  requirement: &22307412 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23358828
+  version_requirements: *22307412
 - !ruby/object:Gem::Dependency
   name: countloc
-  requirement: &23358348 !ruby/object:Gem::Requirement
+  requirement: &22306968 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23358348
+  version_requirements: *22306968
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &23357820 !ruby/object:Gem::Requirement
+  requirement: &22306284 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23357820
+  version_requirements: *22306284
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &23357412 !ruby/object:Gem::Requirement
+  requirement: &22305648 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23357412
+  version_requirements: *22305648
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &23356932 !ruby/object:Gem::Requirement
+  requirement: &22305228 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23356932
+  version_requirements: *22305228
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &23356152 !ruby/object:Gem::Requirement
+  requirement: &22304796 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23356152
+  version_requirements: *22304796
 description: development tasks
 email: lou.parslow@gmail.com
 executables: