dev 1.0.14 → 1.0.15

data/lib/dev/Dep.rb

@@ -0,0 +1,85 @@
+module Dev
+
+#PROJECT = Dev::Project.new( { 
+#  name: 'Musco.Cs.Framework', 
+#  type: 'C#', 
+#   dep: {   nunit:{uri: 'svn://denver-svn/ThirdParty/export/NUnit/2.5.10.11092',
+#                   dir: 'ThirdParty/NUnit/2.5.10.11092'},
+#         specflow:{uri: 'svn://denver-svn/ThirdParty/export/SpecFlow/1.8.1',
+#                   dir: 'ThirdParty/SpecFlow/1.8.1'},
+#        interface:{uri: 'svn://denver-svn/Musco.Cs/Interface/trunk@#{INTERFACE_REV}',
+#                   rake: 'default', cache: 'true' }
+#         } ,
+#  replace: { interface: {   glob: '*.csproj', 
+#                          search: /Musco.Cs\\Interface\\trunk@[\d]+/, 
+#                         replace: "Musco.Cs\\Interface\\trunk@#{INTERFACE_REV}" } }
+#} )
+
+# uri:
+# dir:
+# rake:
+# cache:
+class Dep < Hash
+
+  # constructor that accepts a hash
+  def initialize(hash,init_defaults=true)
+    hash.each { |name,value| self[name]=value }
+  end
+  
+  def get_rel_dir
+    return Dev::Environment.expand_string_variables(self[:dir]) unless self[:dir].nil?
+    uri=Dev::Environment.expand_string_variables(self[:uri])
+    uri_words=uri.split('/')
+    while(uri_words.length > 3) do
+      uri_words.shift 
+    end
+    return uri_words.join('/')
+  end
+  
+  def get_dep_dir
+     return Dev::Environment.dev_root +  "/dep/" + get_rel_dir
+  end
+  
+  def get_wrk_dir
+    return Dev::Environment.dev_root + "/wrk/" + get_rel_dir unless get_rel_dir.include?("@")
+    return Dev::Environment.dev_root + "/wrk/" + get_rel_dir.split("@")[0]
+  end
+  
+  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}"
+    end # unless    
+  end
+  
+  def get_rake_command
+  end
+  
+  
+  def setup_commands
+    array = Array.new
+    array << "<%SystemCall.new('#{get_export_command(get_dep_dir)}') unless File.exists?('#{get_dep_dir}')%>"
+    array << "<%puts ' #{get_dep_dir} exists.' if File.exist?('#{get_dep_dir}')%>"
+    
+    unless self[:rake].nil?
+      array << "{cmd: 'rake #{self.get_value("rake").to_s}', dir: '#{get_dep_dir}', cache:'true'}" unless self.get_value("cache").nil?
+      array << "{cmd: 'rake #{self.get_value("rake").to_s}', dir: '#{get_dep_dir}'}" if self.get_value("cache").nil?
+    end
+    
+    return array
+  end
+  
+  def pull_commands
+    array = Array.new
+    if(File.exists?(get_wrk_dir))
+      unless self[:rake].nil?
+        array << "{cmd: 'rake pull', dir: '#{get_wrk_dir}'}"
+        array << "{cmd: 'rake #{self.get_value("rake").to_s}', dir: '#{get_wrk_dir}'}"
+      end
+    end
+    
+    return array
+  end
+  
+end # class Dep
+end # module Dev

data/lib/dev/Project.rb

@@ -75,6 +75,20 @@ class Project < Hash
     end
     "?"
   end
+ 
+  def check
+    if !has_diff and File.exists?("default.taskstamp") 
+      puts "  no differences detected."
+      puts "  default.taskstamp exists."
+      exit
+    end
+    puts "  detected differences" if has_diff
+    puts "  default.taskstamp does not exist" unless File.exists?("default.taskstamp")
+  end
+  
+  def stamp_task(name)
+    File.open("#{name}.taskstamp","w") { |f| f.write(Time.now.to_s) }
+  end
   
   def replace
     #puts " "
@@ -114,17 +128,64 @@ class Project < Hash
     array_method("features")
   end
   
-  def commit
+  def has_build_products
+  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
-      array_method("commit")
+      puts_debug "call command: " + call.command unless call.nil?
+      puts_debug "diff output: " + call.output unless call.nil?
+      return true  # differences detected
     else
-      puts "  no differences detected"
+     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
   
+  def commit
+    puts " no differences detected" unless has_diff
+    array_method("commit") if has_diff
+  end
+  
+  def rake_working_deps
+    unless dep_hash.nil?
+      dep_hash.each do |key,value|
+        if value.kind_of?(Hash)
+          # potential hash keys: uri, dir, rake
+          # uri is required
+          unless value.get_value("uri").nil?
+            uri=expand_project_variables(value.get_value("uri"))
+            uri_words=uri.split('/')
+            while(uri_words.length > 3) do
+              uri_words.shift 
+            end
+            dir=self[:dev_root] + "/wrk/" + uri_words.join('/')
+            unless value.get_value("rake").nil?
+              if(File.exist?(dir))
+                rake_task=value.get_value("rake") 
+                cmd_hash = {:cmd=> "rake #{rake_task}", :dir=> "#{dir}"}
+              end
+            end
+          end
+        end # unless value.get_value("uri").nil?
+      end
+    end # unless dep_hash.nil?
+  end
+  
+  #def push
+     # loop over all 'rakeable' dependencies, if there is a local working copy, rake them
+     
+     # upgrade dependencies
+     
+     # rake this project
+  #end
+  
   def info
    [ "file_count","loc" ].each do |k| 
       puts_debug "set_default_value(#{k})"
@@ -183,28 +244,24 @@ class Project < Hash
       unless dep_hash.nil?
         dep_hash.each do |key,value|
           if value.kind_of?(Hash)
-            # potential hash keys: uri, dir, rake
-            # uri is required
-            unless value.get_value("uri").nil?
-              uri=expand_project_variables(value.get_value("uri"))
-              uri_words=uri.split('/')
-              while(uri_words.length > 3) do
-                uri_words.shift 
-              end
-              dir=uri_words.join('/')
-              dir=expand_project_variables(value.get_value("dir")) unless value.get_value("dir").nil?
-              dir=self[:dev_root] + "/dep/" + dir unless dir.include?(self[:dev_root]) 
-             
-			  cmd = "svn export " + expand_project_variables(value.get_value("uri")) + " " + dir 
-			  eval_cmd = "<%SystemCall.new('#{cmd}') unless File.exists?('#{dir}')%>"
-			  array << eval_cmd
-              array << "<%puts ' #{dir} exists.' if File.exist?('#{dir}')%>"
-              
-              unless value.get_value("rake").nil?
-                array << "{cmd: 'rake #{value.get_value("rake").to_s}', dir: '#{dir}', cache:'true'}" unless value.get_value("cache").nil?
-                array << "{cmd: 'rake #{value.get_value("rake").to_s}', dir: '#{dir}'}" if value.get_value("cache").nil?
-              end
-            end
+          
+            dep=Dev::Dep.new(value)
+            dep.setup_commands.each{|cmd| array << cmd}
+           
+          end
+        end
+      end
+    end
+    
+    if(key=="pull")
+      # dep,svn directives
+      dep_hash=self.get_value("dep")
+      unless dep_hash.nil?
+        dep_hash.each do |key,value|
+          if value.kind_of?(Hash)
+            dep=Dev::Dep.new(value)
+            dep.pull_commands.each{|cmd| array << cmd}
+            puts_debug "pull array: " + array.to_s
           end
         end
       end
@@ -252,7 +309,7 @@ class Project < Hash
     self[:type]="C#" if self[:type].nil?
     
     [ "version","dev_root","src_glob","scm_type",
-      "paths","setup","compile","test","features","commit" ].each do |k| 
+      "paths","add","pull","setup","compile","test","features","commit" ].each do |k| 
       puts_debug "set_default_value(#{k})"
       set_default_value(k) 
     end

data/lib/dev/Tasks.rb

@@ -15,7 +15,7 @@ task :clean do; task_start "clean"; end
 task :clobber do; task_start "clobber"; end
 
 require 'rake/clean'
-CLEAN.include('*.gem','doc/*','obj/*')
+CLEAN.include('*.gem','doc/*','obj/*','*.taskstamp')
 CLOBBER.include('doc','obj')
 
 def generate_tasks(project)
@@ -26,7 +26,9 @@ def generate_tasks(project)
     :commit=> { :desc=> 'commit' },
     :replace=> { :desc=> 'replace text' },
     :loc=> { :desc=> 'count the lines of code' },
-    :setup=> { :desc=> 'setup the project environment' }
+    :setup=> { :desc=> 'setup the project environment' },
+    :pull=> { :desc=> 'rake working copies of dependencies' },
+    :check=> { :desc=> 'checks if the project default task may be skipped' }
   }
   if project[:type]=="gem" || project[:type]=="ruby"
     task_hash[:features] = { :desc=> 'tests cucumber features' }
@@ -40,6 +42,7 @@ def generate_tasks(project)
       ruby="task :#{name} do; task_start '#{name}'; PROJECT.#{name}; end"
       ruby="desc '#{desc}'; " + ruby unless desc.nil? 
       unless task_defined(name)
+        puts_debug "defining task " + name
         eval(ruby)
       end
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
   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: &26797464 !ruby/object:Gem::Requirement
+  requirement: &23359488 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26797464
+  version_requirements: *23359488
 - !ruby/object:Gem::Dependency
   name: semver
-  requirement: &26797188 !ruby/object:Gem::Requirement
+  requirement: &23358828 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26797188
+  version_requirements: *23358828
 - !ruby/object:Gem::Dependency
   name: countloc
-  requirement: &26796936 !ruby/object:Gem::Requirement
+  requirement: &23358348 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26796936
+  version_requirements: *23358348
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &26796684 !ruby/object:Gem::Requirement
+  requirement: &23357820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26796684
+  version_requirements: *23357820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &26796432 !ruby/object:Gem::Requirement
+  requirement: &23357412 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26796432
+  version_requirements: *23357412
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &26796180 !ruby/object:Gem::Requirement
+  requirement: &23356932 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26796180
+  version_requirements: *23356932
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &26795928 !ruby/object:Gem::Requirement
+  requirement: &23356152 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26795928
+  version_requirements: *23356152
 description: development tasks
 email: lou.parslow@gmail.com
 executables:
@@ -97,6 +97,7 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README
+- lib/dev/Dep.rb
 - lib/dev/Environment.rb
 - lib/dev/Hash.rb
 - lib/dev/Project.rb