dev 1.0.11 → 1.0.12

data/lib/dev/Environment.rb

@@ -1,12 +1,5 @@
 puts_debug "read " + __FILE__.foreground(:green)
 
-#def exec_in_dir(cmd,dir)
-#  Dir.chdir(dir) { |path| 
-#    call=Dev::SystemCall.new(cmd)
-#    call.puts_summary
-#  }
-#end
-
 module Dev
 
 class Environment

data/lib/dev/Project.rb

@@ -2,7 +2,6 @@ puts_debug "read " + __FILE__.foreground(:green)
 require 'semver'
 
 UNITTESTS=Array.new
-
 module Dev
 
 class Project < Hash
@@ -21,8 +20,6 @@ class Project < Hash
       return
     end
     puts_debug "found directives for #{string_name}: #{self.get_value(string_name).to_s}"
-    puts " "
-    puts string_name.foreground(:yellow).bright
     self.get_value(string_name).each{ |c|
       # expand the command here....
       command=expand_command(c)
@@ -41,23 +38,16 @@ class Project < Hash
        call.puts_summary
       end
     }
-    puts " "
   end
   
-  def method_missing( name, *args )
-    array_method(name)
-  end
-  
-  def expand_command(command)
-    result=expand_project_variables(command)
-    return result
-  end
+  def method_missing( name, *args ); array_method(name); end
+  def expand_command(command); expand_project_variables(command); end
   
   def expand_project_variables(str)
-    result=Dev::Environment.expand_string_variables(str)     # expands ruby variables, e.g. '#{name}' to 'widget'
+    result=Dev::Environment.expand_string_variables(str) # expands ruby variables, e.g. '#{name}' to 'widget'
     if result.include?('<') && result.include?('>')
-      result.scan(/(<[\w,]+>)/).each { |pvar|                     # expand project variables, e.g. '<name>' to 'widget
-        key = pvar[0].gsub("<","").gsub(">","")                #                                '<paths,nunit>' to 'C:/wherever/NUnit.exe'
+      result.scan(/(<[\w,]+>)/).each { |pvar|            # expand project variables, e.g. '<name>' to 'widget
+        key = pvar[0].gsub("<","").gsub(">","")          #                                '<paths,nunit>' to 'C:/wherever/NUnit.exe'
         result = result.gsub(pvar[0],get_value(key))
       }
     end
@@ -87,11 +77,15 @@ class Project < Hash
   end
   
   def replace
-    hash=self[:replace]
+    puts " "
+    puts "replace".foreground(:yellow).bright
+    hash=self[:replace] 
+    if hash.nil?
+      puts "  no replace directives"
+    end
     unless hash.nil?
       hash.each do |k,v| 
         unless v.nil?
-          # v[:file], v[:search], v[:replace],v[:glob]
           file=v[:file]
           search=v[:search]
           replace=v[:replace]
@@ -158,7 +152,6 @@ class Project < Hash
     value="**/*.{c,cpp,h,hpp,semver}" if key=="src_glob" && (self[:type]=="C++" || self[:type]=="c++" || self[:type]=="cpp")
     value="**/*.{rb,feature,semver}" if key=="src_glob" && self[:type]=="ruby" 
     value="**/*.{rb,feature,gemspec,semver}" if key=="src_glob" && self[:type]=="gem"
-    #value=Dir.glob(self[:src_glob]).length.to_s if key=="file_count"
     value=loc_total if key=="loc"
     value="svn" if key=="scm_type" && File.exists?(".svn")
     value="git" if key=="scm_type" && File.exists?(".git")
@@ -206,17 +199,13 @@ class Project < Hash
               array << "<%puts ' #{dir} exists.'%>" if File.exists?(dir)
               
               unless value.get_value("rake").nil?
-                array << "{cmd: 'rake #{value.get_value("rake").to_s}', dir: '#{dir}'}"
+                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
           end
         end
       end
-      
-      #bootstrap << "cd lib" if File.exists?("lib/Gemfile")
-      #bootstrap << "cd lib;bundle install;cd .." if File.exists?("lib/Gemfile")
-      #bootstrap << "cd .." if File.exists?("lib/Gemfile")
-      #bootstrap << "<%exec_in_dir('bundle install','lib')%>" if File.exists?("lib/Gemfile")
     end
     if(key=="compile")
       Dir.glob("*.gemspec").each { |gs| array << "gem build #{gs}" } if self[:type]=="gem"

data/lib/dev/SystemCall.rb

@@ -5,12 +5,13 @@ require 'tmpdir'
 module Dev
 
 class SystemCall
-  attr_accessor :output,:error,:status,:command,:start_time,:end_time,:timed_out,:dir
+  attr_accessor :output,:error,:status,:command,:start_time,:end_time,:timed_out,:dir,:cache
 
   def initialize(cmd)
     if(cmd.kind_of?(Hash))
       @command=cmd[:cmd]
       @dir=cmd[:dir] unless cmd[:dir].nil?
+      @cache=cmd[:cache] unless[:cache].nil?
     else
       @command=cmd
     end
@@ -18,8 +19,63 @@ class SystemCall
   end
   
   def elapsed; @end_time-@start_time; end
+  
+  def cache_name
+    name = @dir+"/" + @command.gsub(" ","_").gsub("\\","-").gsub("/","-") unless @dir.nil?
+    name = @command.gsub(" ","_").gsub("\\","-").gsub("/","-") if @dir.nil?
+    return name
+  end
+  
+  def has_cache
+    File.exist?(cache_name)
+  end
+  
+  def get_hash
+    hash = Hash.new()
+    hash[:cmd]=@command
+    hash[:dir]=@dir
+    hash[:output]=@output
+    hash[:error]=@error
+    hash[:status]=@status
+    hash[:start_time]=@start_time
+    hash[:end_time]=@end_time
+    hash[:timed_out]=@timed_out
+    hash[:cache]=@cache
+    return hash
+  end
+  
+  def set_hash(hash)
+    @command=hash[:cmd] unless hash[:cmd].nil?
+    @dir=hash[:dir] unless hash[:dir].nil?
+    @output=hash[:output] unless hash[:output].nil?
+    @error=hash[:error] unless hash[:error].nil?
+    @status=hash[:status] unless hash[:status].nil?
+    @start_time=hash[:start_time] unless hash[:start_time].nil?
+    @end_time=hash[:end_time] unless hash[:end_time].nil?
+    @timed_out=hash[:timed_out] unless hash[:timed_out].nil?
+    @cache=hash[:cache] unless hash[:cache].nil?
+  end
+  
+  def write_cache
+    marshal_dump = Marshal.dump(get_hash)
+    file=File.new(cache_name,'wb')
+    file.write marshal_dump
+    file.close
+  end
+  
+  def load_cache
+    file=File.open(cache_name,'rb')
+    hash = Marshal.load file.read
+    file.close
+    set_hash hash
+  end
+  
   def execute(cmd) 
-    #@command=cmd
+    
+    if !@cache.nil? && has_cache
+      load_cache
+      return
+    end
     @start_time=Time.now
     filename=Dir.tmpdir + "/" + (0...8).map{65.+(rand(25)).chr}.join
     begin
@@ -43,6 +99,7 @@ class SystemCall
     rescue
         puts "error executing ruby code"
     ensure
+        write_cache if !@cache.nil?
         begin
          File.delete("#{filename}.out") if File.exists?("#{filename}.out")
          File.delete("#{filename}.err") if File.exists?("#{filename}.err")
@@ -52,12 +109,11 @@ class SystemCall
     end
   end
   
-  
-  
   def puts_summary
     if(@status != 0)
       summary =  "  [".foreground(:cyan) + "X".foreground(:red).bright + "]".foreground(:cyan) + " system(\"" + @command.foreground(:green) + "\") has exit status of " + @status.to_s
       summary += " dir: " + @dir unless @dir.nil?
+      summary += " cache: true" unless @cache.nil?
       puts summary
       puts @output
       warn @error
@@ -66,6 +122,7 @@ class SystemCall
       elapsed_str="[" + "%.0f" %(elapsed) + "s]"
       summary = "  [".foreground(:cyan) + "+".foreground(:green) + "]".foreground(:cyan) + " system(\"" + @command.foreground(:green) + "\") " + elapsed_str.foreground(:cyan) 
       summary += " dir: " + @dir unless @dir.nil?
+      summary += " cache: true" unless @cache.nil?
       puts summary
     end
   end

data/lib/dev/Tasks.rb

@@ -2,68 +2,40 @@ puts_debug "read " + __FILE__.foreground(:green)
 
 require 'rake' 
 include Rake::DSL
-#desc "checks for a sane environment"
-#task :sanity do
-#  if(!defined?(PROJECT))
-#    throw "PROJECT must be defined"
-#  end
-#  PROJECT.sanity
-#end
+
+def task_start(task_name)
+  puts " "
+  puts "[:#{task_name}]".foreground(:yellow).bright
+end
+
+task :clean do; task_start "clean"; end
+task :clobber do; task_start "clobber"; end
 
 require 'rake/clean'
 CLEAN.include('*.gem','doc/*','obj/*')
-CLOBBER.include('bin','doc','obj')
+CLOBBER.include('doc','obj')
 
 def generate_tasks(project)
-   unless project.nil?
-    unless task_defined("setup")
-      desc "setup the project environment"
-      task :setup do
-        PROJECT.setup
-      end
-    end
-    
-    if project[:type]=="gem" || project[:type]=="ruby"
-      unless task_defined("features")
-        desc "tests cucumber features"
-        task :features do; PROJECT.features; end
-      end
-    end
-    
+  task_hash = { 
+    info: { desc: 'display information about the rakefile' },
+    compile: { desc: 'compile' },
+    test: { desc: 'run unit tests' },
+    commit: { desc: 'commit' },
+    replace: { desc: 'replace text' },
+    loc: { desc: 'count the lines of code' },
+    setup: { desc: 'setup the project environment' }
+  }
+  if project[:type]=="gem" || project[:type]=="ruby"
+    task_hash[:features] = { desc: 'tests cucumber features' }
   end
-end
-
-
-
-
-
-desc "display information about the rakefile"
-task :info do
-  PROJECT.info
-end
-
-desc "compile"
-task :compile do
-  PROJECT.compile
-end
-
-desc "run unit tests"
-task :test do
-  PROJECT.test          # we want an exception raised here if PROJECT is undefined or nil
-end
-
-desc "commit"
-task :commit do
-  PROJECT.commit        # we want an exception raised here if PROJECT is undefined or nil
-end
-
-desc "replace text based on replace: hash entries"
-task :replace do
-  PROJECT.replace
-end
-
-desc "count the lines of code"
-task :loc do
-  PROJECT.loc
-end
-
+  task_hash.each do |k,v|
+    name=k.to_s
+    desc=nil
+    desc=v[:desc] if v.has_key?(:desc)
+    ruby="task :#{name} do; task_start '#{name}'; PROJECT.#{name}; end"
+    ruby="desc '#{desc}'; " + ruby unless desc.nil? 
+    unless task_defined(name)
+      eval(ruby)
+    end
+ end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-03 00:00:00.000000000 Z
+date: 2012-02-03 00:00:00.000000000 -07:00
+default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &27112740 !ruby/object:Gem::Requirement
+  requirement: &22267620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27112740
+  version_requirements: *22267620
 - !ruby/object:Gem::Dependency
   name: semver
-  requirement: &27112464 !ruby/object:Gem::Requirement
+  requirement: &22267248 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27112464
+  version_requirements: *22267248
 - !ruby/object:Gem::Dependency
   name: countloc
-  requirement: &27112212 !ruby/object:Gem::Requirement
+  requirement: &22266792 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27112212
+  version_requirements: *22266792
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &27111960 !ruby/object:Gem::Requirement
+  requirement: &22266456 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27111960
+  version_requirements: *22266456
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &27111708 !ruby/object:Gem::Requirement
+  requirement: &22266132 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27111708
+  version_requirements: *22266132
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &27111456 !ruby/object:Gem::Requirement
+  requirement: &22265796 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27111456
+  version_requirements: *22265796
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &27111204 !ruby/object:Gem::Requirement
+  requirement: &22265424 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +88,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27111204
+  version_requirements: *22265424
 description: development tasks
 email: lou.parslow@gmail.com
 executables:
@@ -105,6 +106,7 @@ files:
 - lib/dev/Tasks.rb
 - lib/dev.rb
 - bin/dev
+has_rdoc: true
 homepage: http://rubygems.org/gems/dev
 licenses: []
 post_install_message: 
@@ -125,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: dev
-rubygems_version: 1.8.11
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: dev