dev 2.0.269 → 2.0.270

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b589fd7c6e934568a25fedd9390eb9eb34c249b
-  data.tar.gz: f3120161faf84cb33c7ecde90ca3a36f69d0e378
+  metadata.gz: 7248978e9485e170b6131017226eac544530bca6
+  data.tar.gz: 2c4152f5040c40985aeaf736114eeeccc6c3657a
 SHA512:
-  metadata.gz: 4a1005b6587fe75f6552d75f47753651b71f9968a8cfd4a75499d1252ccc4ccec35ce7599322ebb79c9d440613f337b4e65f2ec3bd215d00e5af37cceab91aae
-  data.tar.gz: cdd95c1496bdbca9e0d5cc90fc44a252ab5b51ce391f56fd932b848044316ede3488d7332c6df9d8ab42a5426c8b2e54e2295987eb98595f491a5ae29123c46f
+  metadata.gz: 16928d3ab7e5a7173c68e7d3deb8aba002e99ab85c62118fff688bc204aa8c37df6d4476af7ba631d3986b063de4aa387e54089eb7dd2d9ef98841c4f413b968
+  data.tar.gz: cb72c3f82c26e5650d39b769b0518f6295bd1538a3bf72d8a6a92be25980b719ffd8d8f03286c52f13dc18083f632090d9b8dea3879ca14e08f108af42584ce8

data/lib/apps/svn.rb

@@ -1,7 +1,6 @@
-puts __FILE__ if defined?(DEBUG)
-
 require 'fileutils'
 require 'tmpdir'
+require_relative('../base/dir.rb')
 class Svn
 
 	def self.latest_revision
@@ -131,7 +130,7 @@ class Svn
 				end
 				
 				#begin
-				Environment.remove "#{dir}/to_publish_checkout"
+				Dir.remove "#{dir}/to_publish_checkout"
 				output
 			}
 		end

data/lib/base/array.rb

@@ -11,7 +11,7 @@ class Array
       @env=Environment.new() if @env.nil? 
       i=0
       while i < self.length
-        self[i]=Command.new(self[i]) if(self[i].is_a?(String))
+        self[i]=Command.new({ :input => self[i], :quiet => true }) if(self[i].is_a?(String))
         self[i]=Command.new(self[i]) if(self[i].is_a?(Hash) && !self[i].is_a?(Command))
 
         if(!value.nil? && value.is_a?(Hash))
@@ -36,7 +36,11 @@ class Array
       return true if(command.kind_of?(String) && !include?(command))
       if(command.kind_of?(Command))
         self.each{|c|
-           return true if(c[:input] == command[:input])
+          if c.kind_of?(String)
+            return true if command[:input] == c
+          else
+            return true if(c[:input] == command[:input])
+          end
         }
       end
       false

data/lib/base/dir.rb

@@ -21,4 +21,19 @@ class Dir
     end
     false
   end
+
+  def self.get_latest_mtime directory
+    mtime=Time.new(1980)
+    Dir.chdir(directory)  do
+      latest_filename=''
+      Dir.glob('**/*.*').each{|f|
+        if mtime.nil? || File.mtime(f) > mtime
+          mtime=File.mtime(f) 
+          latest_filename=f
+        end
+      }
+      puts "   latest_mtime #{mtime.to_s} #{latest_filename}" if Environment.default.debug?
+    end
+    mtime
+  end
 end

data/lib/base/environment.rb

@@ -25,36 +25,36 @@ class Environment < Hash
   def self.dev_root
     default.root_dir
   end
-
   #####End LEGACY support
+
   def root_dir
-    get_env('DEV_ROOT')
+    get_env('DEV_ROOT').gsub('\\','/')
   end
  
   def home_dir
-    get_env('HOME')
+    get_env('HOME').gsub('\\','/')
   end
 
   def log_dir
-    dir="#{get_env('DEV_ROOT')}/log/#{user}@#{machine}"
+    dir="#{root_dir}/log/#{user}@#{machine}"
     FileUtils.mkdir_p dir if !File.exists? dir
     dir
   end
 
   def make_dir
-    dir="#{get_env('DEV_ROOT')}/make"
+    dir="#{root_dir}/make"
     FileUtils.mkdir_p dir if !File.exists? dir
     dir
   end
 
   def publish_dir
-    dir="#{get_env('DEV_ROOT')}/publish"
+    dir="#{root_dir}/publish"
     FileUtils.mkdir_p dir if !File.exists? dir
     dir
   end
 
   def wrk_dir
-    dir="#{get_env('DEV_ROOT')}/wrk"
+    dir="#{root_dir}/wrk"
     FileUtils.mkdir_p dir if !File.exists? dir
     dir
   end
@@ -108,6 +108,15 @@ class Environment < Hash
     colorize
   end
 
+  def working?
+    return true if Rake.application.original_dir.include? wrk_dir
+    false
+  end
+
+  def has_work?
+    true
+  end
+
   def out message
       puts message if !get_env('SUPPRESS_CONSOLE_OUTPUT')
       @output=@output+message+'\n'
@@ -121,40 +130,6 @@ class Environment < Hash
     Gem.win_platform?
   end
 
-  #@@debug=true if defined?(DEBUG)
-  #@@debug=false if !defined?(DEBUG)
-  #@@development_root=nil
-
-  #def initialize
-    #self[:home]=Environment.home
-    #self[:machine]=Environment.machine
-    #self[:user]=Environment.user
-  #end
-
-  #def self.set_development_root value
-  #  @@development_root=value
-  #  if(!value.nil?)
-  #    FileUtils.mkdir_p value if(!File.exists?(value))
-  #    ['bin','data','log','make','publish','test'].each{|dir|
-  #      #FileUtils.mkdir_p("#{value}/#{dir}") if !File.exists? "#{value}/#{dir}"
-  #    }
-  #  end
-  #end
-
-  #def self.debug
-  #  @@debug
-  #end
-
-  #def self.home 
-  #  ["USERPROFILE","HOME"].each {|v|
-  #    return ENV[v].gsub('\\','/') unless ENV[v].nil?
-  #  }
-  #  dir="~"
-  #  dir=ENV["HOME"] unless ENV["HOME"].nil?
-  #  dir=ENV["USERPROFILE"].gsub('\\','/') unless ENV["USERPROFILE"].nil?
-  #  return dir
-  #end
-
   #def self.configuration
   #  config="#{Environment.home}/dev.config.rb"
   #  if(!File.exists?(config))
@@ -164,40 +139,14 @@ class Environment < Hash
   #  config
   #end
 
-  #def self.machine
-  #   if !ENV['COMPUTERNAME'].nil? 
-	#   return ENV['COMPUTERNAME']
-	# end
-
-  #   machine = `hostname`
-  #   machine = machine.split('.')[0] if machine.include?('.')
-	# return machine.strip
-  #end
-
-  def self.remove directory
-    if(File.exists?(directory))
-      begin
-        FileUtils.rm_rf directory
-        FileUtils.rm_r directory
-      rescue
-      end
-    end
-  end
-
-  #def self.user
- # 	return ENV['USER'] if !ENV['USER'].nil?  #on Unix
- #   ENV['USERNAME']
-  #end
-
-  #def self.dev_root
-  #  if(!@@development_root.nil?)
-  #    return @@development_root
+  #def self.remove directory
+  #  if(File.exists?(directory))
+  #    begin
+  #      FileUtils.rm_rf directory
+  #      FileUtils.rm_r directory
+  #    rescue
+  #    end
   #  end
-  #  ["DEV_HOME","DEV_ROOT"].each {|v|
-  #    return ENV[v].gsub('\\','/') unless ENV[v].nil?
-  #  }
-  #  dir=home
-  # return dir
   #end
 
   def self.check
@@ -248,13 +197,13 @@ class Environment < Hash
     }
   end
 
-  def self.get_latest_mtime directory
-    mtime=Time.new(1980)
-    Dir.chdir(directory)  do
-      Dir.glob('**/*.*').each{|f|
-        mtime=File.mtime(f) if mtime.nil? || File.mtime(f) > mtime
-      }
-    end
-    mtime
-  end
+  #def self.get_latest_mtime directory
+  #  mtime=Time.new(1980)
+  #  Dir.chdir(directory)  do
+  #    Dir.glob('**/*.*').each{|f|
+  #      mtime=File.mtime(f) if mtime.nil? || File.mtime(f) > mtime
+  #    }
+  #  end
+  #  mtime
+  #end
 end

data/lib/base/project.rb

@@ -1,7 +1,9 @@
 puts __FILE__ if defined?(DEBUG)
 
 require 'json'
+require 'rake'
 require_relative('../apps/svn.rb')
+require_relative('dir.rb')
 require_relative('environment.rb')
 require_relative('string.rb')
 
@@ -156,10 +158,43 @@ class Project < Hash
     def command_history tags=nil
     	commands=Array.new
     	log_filenames(tags).each{|logfile|
-    		commands << Command.new(JSON.parse(IO.read(logfile)))
+            begin
+                cmd=Command.new(JSON.parse(IO.read(logfile)))
+                commands << cmd
+            rescue
+            end
+    		
     	}
         commands
     end
+   
+    def work_up_to_date?
+        if wrk_dir == Rake.application.original_dir
+          logfile=get_logfile ['up2date']
+          if File.exists? logfile
+            last_work_time=File.mtime(logfile)
+            last_file_changed=Dir.get_latest_mtime Rake.application.original_dir
+            if last_work_time > last_file_changed
+                CLEAN.include logfile
+                return true
+            else
+                File.delete(logfile)
+            end
+          end
+        else
+            puts "wrk_dir does not match Rake.application.original_dir" if @env.debug?
+        end
+        false
+    end
+
+    def mark_work_up_to_date
+        if wrk_dir == Rake.application.original_dir
+          logfile=get_logfile ['up2date']
+          File.open(logfile,'w'){|f|f.write(' ')}
+        else
+            puts "wrk_dir does not match Rake.application.original_dir" if @env.debug?
+        end
+    end
 
     def get_logfile tags
     	tagstring=''
@@ -265,7 +300,7 @@ class Project < Hash
         logfile=get_logfile ['work']
         if(File.exists?(wrk_dir))
             rake_default=Command.new({:input =>'rake default',:quiet => true,:ignore_failure => true})
-            if(last_work_mtime.nil? || last_work_mtime < Environment.get_latest_mtime(wrk_dir))
+            if(last_work_mtime.nil? || last_work_mtime < Dir.get_latest_mtime(wrk_dir))
               Dir.chdir(wrk_dir) do
 
                 @env.out fullname
@@ -392,16 +427,28 @@ class Project < Hash
     	checkout
     	if(File.exists?(wrk_dir))
     		Dir.chdir(wrk_dir) do
-    			rake_default=Command.new('git pull')
-				rake_default[:quiet]=true
-				rake_default[:ignore_failure]=true
-				rake_default.execute
-				rake_default=Command.new('svn update')
-				rake_default[:quiet]=true
-				rake_default[:ignore_failure]=true
-				rake_default.execute
+                if(File.exists?('.git'))
+                  pull=Command.execute(Command.new({:input => 'git pull', :quiet => true, :ignore_failure => true}))
+                  @env.out pull.summary
+                  return pull
+    			  #pull=Command.new('git pull')
+				  #rake_default[:quiet]=true
+				  #rake_default[:ignore_failure]=true
+				  #rake_default.execute
+                  #return rake_defa
+                end
+                if(File.exists?('svn'))
+                    updateCmd=Command.execute(Command.new({:input => 'svn update', :quiet => true, :ignore_failure => true}))
+                    @env.out updateCmd.summary
+                    return updateCmd
+                end
+				#rake_default=Command.new('svn update')
+				#rake_default[:quiet]=true
+				#rake_default[:ignore_failure]=true
+				#rake_default.execute
     		end
     	end
+        return Command.new({:exit_code => 1})
     end
 
     def tags

data/lib/base/projects.rb

@@ -20,12 +20,14 @@ class Projects < Hash
 		"#{@env.root_dir}/data/Projects.json"
 	end
 
-    #def update_state
-    #	self.each{|k,v|
-    #		self[k]=Project.new(v) if(v.is_a?(String))
-    #		self[k][:fullname]=k
-    #	}
-    #end
+    def current
+      fullname=Rake.application.original_dir.gsub("#{Environment.default.wrk_dir}/",'')
+      if(self.has_key? fullname)
+        self[fullname]
+      else
+        nil
+      end
+    end
 
 	def save
 		Dir.make File.dirname(filename) if !File.exists? File.dirname(filename)
@@ -79,6 +81,19 @@ class Projects < Hash
     	end
     end
 
+    def remove args
+    	projects=get_projects args
+		puts "removing #{projects.length} projects..." if @env.debug?
+		remove_keys=[]
+    	projects.each{|project|
+    		project.clobber
+    		remove_keys << project.fullname
+    	}
+    	remove_keys.each{|key|self.delete(key)}
+    	self.save
+    	return 0
+	end
+
     def help args
     end
     
@@ -125,6 +140,7 @@ class Projects < Hash
     		project.list
     		
     	}
+    	return 0
 	end
 
 	def make args
@@ -162,12 +178,18 @@ class Projects < Hash
     end
 
 	def update args
-		filter=''
-		filter=args[1] if !args.nil? && args.length > 0
-		self.each{|k,v|
-			if filter.nil? || filter.length==0 || k.include?(filter)
-				puts "updating #{v.fullname}"
-			 	v.update
+		projects=get_projects args
+		puts "updating #{projects.length} projects..." if @env.debug?
+		projects.each{|project|
+		    begin
+		    	puts "updating #{project.fullname}" if @env.debug?
+    		    result=project.update
+    		    exit_code=result.exit_code if(result.exit_code!=0)
+    		rescue => error
+		    	puts "error raised during update #{project.fullname}"
+		    	puts "--------------------------------------------"
+		    	puts error
+		    	puts "--------------------------------------------"
 		    end
 		}
 	end

data/lib/base/text.rb

@@ -3,16 +3,28 @@ puts __FILE__ if defined?(DEBUG)
 class Text
   def self.replace_in_glob(glob,search,replace)
      Dir.glob(glob).each{ |f| replace_in_file(f,search,replace) }
-   end
+  end
    
-   def self.replace_in_file(filename,search,replace)
-     text1 = IO.read(filename)
-     text2 = text1.gsub(search) { |str| str=replace }
-     unless text1==text2
-       File.open(filename,"w") { |f| f.puts text2 }
-       return true
-     end
-     false
-   end
+  def self.replace_in_file(filename,search,replace)
+    text1 = IO.read(filename)
+    text2 = text1.gsub(search) { |str| str=replace }
+    unless text1==text2
+      File.open(filename,"w") { |f| f.puts text2 }
+      return true
+    end
+    false
+  end
 
+ def self.copy_if_different(source,destination)
+    if(!File.exists?(destination))
+      FileUtils.cp source, destination
+    else
+      source_text=IO.read(source)
+      destination_text=IO.read(destination)
+      if(source_text != destination_text)
+        FileUtils.rm destination
+        FileUtils.cp source, destination
+      end
+    end
+   end
 end

data/lib/commands.rb

@@ -1,10 +1,12 @@
-puts __FILE__ if defined?(DEBUG)
+puts __FILE__ if ENV.has_key?('DEBUG')
+
+require_relative('apps.rb')
 
 require 'json'
 require 'rake/clean'
 
 Dir.glob("#{File.dirname(__FILE__)}/tasks/*.rb").each{|rb| 
-  require(rb)
+  require(rb) if !rb.include?('default')
 }
 class Commands < Hash
 	attr_accessor :env

data/lib/dev.rb

@@ -1,11 +1,9 @@
-puts __FILE__ if defined?(DEBUG)
+puts __FILE__ if ENV.has_key?('DEBUG')
 
-require_relative('base.rb')
-require_relative('apps.rb')
-require_relative('tasks.rb')
+require_relative('base/environment.rb')
+require_relative('base/projects.rb')
 require_relative('commands.rb')
 
-#PROJECT=Project.new()
 
 class Dev
 	attr_accessor :env,:projects,:commands
@@ -44,6 +42,7 @@ class Dev
 		   return projects.list(subargs) if subcommand=='list'
 		   return projects.make(subargs) if subcommand=='make'
 		   return projects.info(subargs) if subcommand=='info'
+		   return projects.remove(subargs) if subcommand=='remove'
 		   return projects.work(subargs) if subcommand=='work'
 		   return projects.update(subargs) if subcommand=='update'
 
@@ -52,8 +51,6 @@ class Dev
 		end
 	end
 
-    
-
 	def usage
 		return 0
 		@env.out 'usage: dev <subcommand> [options]'
@@ -70,4 +67,12 @@ class Dev
 	end
 end
 
-DEV=Dev.new
+require_relative('base.rb')
+#require_relative('apps.rb')
+require_relative('tasks.rb')
+require_relative('commands.rb')
+
+puts "defining DEV" if Environment.default.debug?
+DEV=Dev.new
+require_relative('tasks/default.rb')
+

data/lib/tasks/default.rb

@@ -1,33 +1,57 @@
-puts __FILE__ if defined?(DEBUG)
-
+require 'rake'
 require_relative('info.rb')
 require_relative('../base/array.rb')
+require_relative('../base/dir.rb')
 require_relative('../base/environment.rb')
 require_relative('../base/projects.rb')
+require_relative('../base/project.rb')
 require_relative('../base/timer.rb')
 
-if(!defined?(NO_DEFAULT_TASK)) 
-  desc 'perform project commands to push gem development'
-  task :default do
-    if(defined?(DEFAULT_TASKS))
-      DEFAULT_TASKS.each{|task| Rake::Task[task].invoke}
+puts "defining DEFAULT TASK" if Environment.default.debug?
+
+work_up_to_date=false
+if(defined?(DEV))
+  puts "DEFAULT: DEV is defined" if DEV.env.debug?
+  project=DEV.projects.current
+  puts "project is nil" if DEV.env.debug? && project.nil?
+  if(!project.nil?)
+    if(project.work_up_to_date?)
+      puts "project work is up to date" if DEV.env.debug?
+      work_up_to_date=true
     else
-    	if(File.exists?('.git'))
-    		[:setup,:build,:test,:add,:commit,:publish,:clean,:push,:pull].each{|task| Rake::Task[task].invoke}
-    	else
-  	  	if(File.exists?('.svn'))
-  	  		[:setup,:build,:test,:add,:commit,:publish,:clean,:update].each{|task| Rake::Task[task].invoke}
-  	  	else
-          [:setup,:build,:test,:publish].each{|task| Rake::Task[task].invoke}
-  	  	end
-  	 end
+      puts "project work is NOT up to date" if DEV.env.debug?
     end
-    
+  end
+end
+
+if(defined?(NO_DEFAULT_TASK))
+  puts "NO_DEFAULT_TASK is defined" if Environment.default.debug?
+else
+  default_tasks=nil
+  default_tasks=DEFAULT_TASKS if defined? DEFAULT_TASKS
+  if(default_tasks.nil?)
+    if(work_up_to_date)
+      default_tasks=[]
+    elsif(File.exists?('.git'))
+      default_tasks=[:setup,:build,:test,:add,:commit,:publish,:clean,:push,:pull]
+    elsif File.exists?('.svn')
+      default_tasks=[:setup,:build,:test,:add,:commit,:publish,:clean,:update]
+    else
+      default_tasks=[:setup,:build,:test,:publish]
+    end
+  end
+
+  puts "default_tasks=#{default_tasks}" if Environment.default.debug?
+  desc "default task #{default_tasks.to_s}"
+  task :default do
+    default_tasks.each{|task| 
+      Rake::Task[task].invoke 
+    }
+    project.mark_work_up_to_date if !project.nil?
     puts "[:default] completed in #{TIMER.elapsed_str}" if !Environment.default.colorize?
     if Environment.default.colorize?
       require 'ansi/code'
       puts ANSI.white + ANSI.bold + ":default"  + " completed in " + ANSI.yellow + "#{TIMER.elapsed_str}" + ANSI.reset
     end
-
-  end # :default
+  end
 end

data/lib/tasks/doc.rb

@@ -1,5 +1,3 @@
-puts __FILE__ if defined?(DEBUG)
-
 desc 'performs documentation commands'
 task :doc do Tasks.execute_task :doc;end
 

data/lib/tasks/info.rb

@@ -1,5 +1,3 @@
-puts __FILE__ if defined?(DEBUG)
-
 desc 'displays project info'
 task :info do
 	Environment.info

data/lib/tasks/publish.rb

@@ -1,4 +1,3 @@
-puts __FILE__ if defined?(DEBUG)
 require_relative '../base/array.rb'
 desc 'performs publish commands'
 task :publish do Tasks.execute_task :publish; end

data/lib/tasks/push.rb

@@ -1,5 +1,3 @@
-puts __FILE__ if defined?(DEBUG)
-
 desc 'performs a git push'
 task :push do Tasks.execute_task :push;end
 

data/lib/tasks/setup.rb

@@ -13,6 +13,7 @@ class Setup < Array
 	end
 
 	def update
+		puts "Setup.update" if Environment.default.debug?
 		env=Environment.new if env.nil?
 
 		add_quiet 'bundle install' if File.exists? 'Gemfile'

data/lib/tasks/test.rb

@@ -1,5 +1,3 @@
-puts __FILE__ if defined?(DEBUG)
-
 #
 # nunit dlls may be specified with
 # NUNIT=FileList.new('**/*.Test.dll')

data/lib/tasks/update.rb

@@ -1,5 +1,3 @@
-puts __FILE__ if defined?(DEBUG)
-
 desc 'performs svn update'
 task :update do Tasks.execute_task :update; end
 

data/lib/tasks.rb

@@ -44,5 +44,5 @@ end
 
 ['add','analyze','build','clobber','commit',
  'doc','info','publish','pull','push','setup','test',
- 'update','default'].each{|name| require_relative("tasks/#{name}.rb")}
+ 'update'].each{|name| require_relative("tasks/#{name}.rb")}
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 2.0.269
+  version: 2.0.270
 platform: ruby
 authors:
 - Lou Parslow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake