dev 1.0.225 → 1.0.227

data/README

@@ -1,7 +1,7 @@
-=dev (README)
-The dev gem may be used to auto generate rake tasks for a rakefile.rb
-A constant hash DEV is defined that is populated based on the content
-of the directory in which a rakefile.rb resides.
+=dev  {<img src="https://badge.fury.io/rb/dev.png" alt="Gem Version" />}[http://badge.fury.io/rb/dev]
+The dev gem may be used to auto generate rake tasks for a rakefile.rb. 
+The gem defined DEV as a hash, which is populated based on the content
+of the directory in which the rakefile.rb resides.
 The dev gem provides task definitions to support the development of ruby,c#,c++ and c projects.
 The DEV variable may be manipulated to modify the behavior of defined tasks or to 
 cause additional task to be generated.
@@ -31,7 +31,6 @@ DEV may define several keys automatically
   CLEAN.include('doc')
 ====CLOBBER is a Rake::FileList that specifies file(s) to be removed during the clobber task.
   CLOBBER.include('obj')
-====BUILD_PRODUCTS is a Rake::FileList that specified file(s) that are required to consume the project.
 ===Tasks
 dev will automatically generated the following tasks as applicable.
   rake add       # add files defined by src_glob to source code management, not generated if no scm can be detected.

data/lib/dev/Commands.rb

@@ -1,4 +1,4 @@
-["Clean","Compile","Replace","Setup","Test","Commit","Info","Update","Pull","Build"].each{ |f| require_relative("cmd/#{f}.rb") }
+["Compile","Replace","Setup","Test","Commit","Info","Update","Push","Build"].each{ |f| require_relative("cmd/#{f}.rb") }
 
 module Dev
 class Commands < Hash
@@ -10,7 +10,7 @@ class Commands < Hash
 	self[:test]=Dev::Cmd::Test.new
 	self[:commit]=Dev::Cmd::Commit.new
 	self[:update]=Dev::Cmd::Update.new
-	self[:pull]=Dev::Cmd::Pull.new
+	#self[:pull]=Dev::Cmd::Pull.new
     refresh
   end
 
@@ -29,6 +29,7 @@ class Commands < Hash
   def setup; execute_method "setup"; end
   def compile; execute_method "compile"; end
   def test; execute_method "test"; end
+  def push; Dev::Cmd::Push.execute; end
   def update;execute_method("update");end
   def replace
     self[:replace].execute if self[:replace].respond_to?("execute")

data/lib/dev/Project.rb

@@ -36,6 +36,7 @@ class Project < Hash
 	  ENV["VisualStudioVersion"]="11.0" if h[:toolset]=="msvc-11.0"
 	end
 	
+	
 	puts_debug "Dev::Project.defaults :type"
 	h[:type]="gem"
 	puts_debug "Dev::Project.defaults B"
@@ -123,38 +124,12 @@ class Project < Hash
     File.open("#{name}.taskstamp." + context,"w") { |f| f.write(Time.now.to_s) }
   end
   
-  def remove_all_but_build_products
-    if(!File.exists?('build_products.txt'))
-	  puts 'build_products.txt does not exist'
-	else
-	  build_products=Array.new
-	  File.open('build_products.txt').each {|line|
-	     build_products << line.strip
-	  }
-	  build_products << 'rakefile.rb'
-	  build_products << 'build_products.txt'
-	
-	  Dir.glob('**/*').each {|f|
-	    begin
-	      if(build_products.include?(f))
-		    puts "leaving " + f
-		  else
-		    if(!File.directory?(f))
-		      puts "deleting " + f
-	          FileUtils.rm(f)
-		    end
-		  end
-		rescue
-		end
-	  }
-	  Dir.glob("**/*").select { |d| 
-        File.directory?(d)
-      }.reverse_each { |d| 
-        if ((Dir.entries(d) - %w[ . .. ]).empty?)
-          Dir.rmdir(d)
-        end
-      }
-	end
+  def dep?
+    return self[:directory].include?("#{self[:dev_root]}/dep/")
+  end
+
+  def wrk?
+    return self[:directory].include?("#{self[:dev_root]}/wrk/")
   end
 
 end

data/lib/dev/SystemCall.rb

@@ -171,17 +171,6 @@ class SystemCall
     status=$?.exitstatus 
     return status,output,error
   end
-    
-  def self.clean_tmp_files
-    puts "clean temporary files in #{Dir.tmpdir}"
-	Dir.glob("#{Dir.tmpdir}/*.{out,err}").each{ |f|
-	  begin
-	    FileUtils.rm(f)
-	  rescue
-	    warn "unable to remove file #{f}.err"
-	  end
-	}
-  end
 
   def puts_summary
     puts_summary2(@throw_on_error)

data/lib/dev/Tasks.rb

@@ -1,6 +1,7 @@
 puts_debug "read " + __FILE__.foreground(:green)
 
 require 'rake' 
+require 'tmpdir'
 
 if("#{RUBY_VERSION}">"1.9.1")
   include Rake::DSL
@@ -11,34 +12,14 @@ def task_start(task_name)
   puts "[:#{task_name}]".foreground(:yellow).bright + " " + Dir.pwd
 end
 
-task :clean do; 
-  task_start "clean"; 
-  puts "  cleaning tmp dir (max 30 seconds)"
-  Dev::SystemCall.clean_tmp_files
-  Dev::Cmd::Clean.clean_tmp
+task :clean do;  task_start "clean"; 
  end
 task :clobber do; task_start "clobber"; end
 
-task :log_build_products do
-  task_start "log_build_products"
-  items=BUILD_PRODUCTS.to_a
-  if(items.nil? || items.empty?)
-    puts "  no BUILD_PRODUCTS defined."
-  else
-	File.open('build_products.txt','w') {|f|
-	  puts "  BUILD_PRODUCTS (#{items.length}):"
-	  items.each{|item|
-	    puts "  " + item
-	    f.puts(item)
-	  }
-	}
-  end
-end
-
 require 'rake/clean'
-CLEAN.include('doc','*.gem','*.taskstamp*','**/*.{suo,sdf}')
-CLOBBER.include('bin','obj')
-BUILD_PRODUCTS = Rake::FileList.new 
+CLEAN.include('doc','*.taskstamp*','**/*.{suo,sdf}')
+CLOBBER.include('bin','obj',"#{Dir.tmpdir}/*{err,out}",'*.gem')
+
 def generate_task_hash(project)
   task_hash = { 
     :info=> { :desc=> 'display information about the rakefile' },
@@ -86,17 +67,11 @@ def generate_tasks(project)
 	end
   end
 
-  if(DEV[:directory].include?("#{DEV[:dev_root]}/dep") && BUILD_PRODUCTS.to_a.length > 0)
-	ruby="task :remove_all_but_build_products do; task_start 'remove_all_but_build_products'; DEV.remove_all_but_build_products; end"
-	ruby="desc 'remove all files but build products'; " + ruby
-	eval(ruby)
-  end
-
   # generate default task
   if(!defined?(DEV_NO_DEFAULT_TASK))
     Rake.application.instance_variable_get('@tasks').delete('default')
 	task_list=""
-	default_task_order=["check","setup","replace","pre_compile","compile","post_compile","pre_test","test","post_test","log_build_products","add","commit","update","remove_all_but_build_products","finalize"]
+	default_task_order=["check","setup","replace","pre_compile","compile","post_compile","pre_test","test","post_test","add","commit","update","clean","finalize"]
 	if(defined?(DEFAULT_TASK_ORDER))
 	 default_task_order = DEFAULT_TASK_ORDER
 	end

data/lib/dev/cmd/Info.rb

@@ -7,7 +7,6 @@ class Info
     puts " "
 	puts "CLEAN " + CLEAN.to_s
 	puts "CLOBBER " + CLOBBER.to_s
-	puts "BUILD_PRODUCTS " + BUILD_PRODUCTS.to_s
 	puts "CMD"
 	Hash.print_hash("",CMD)
     puts " "

data/lib/dev/cmd/Push.rb

@@ -0,0 +1,14 @@
+module Dev
+module Cmd
+class Push
+  def self.execute
+    puts "Push"
+	DEV[:dep].each { |dep|
+	  #begin
+	  #  dep.rake
+	  #rescue
+	}
+  end
+end # class Info
+end # module Cmd
+end # module Dev

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 1.0.225
+  version: 1.0.227
   prerelease: 
 platform: ruby
 authors:
@@ -139,6 +139,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -199,11 +215,10 @@ files:
 - lib/dev/Array.rb
 - lib/dev/BoostBuild.rb
 - lib/dev/cmd/Build.rb
-- lib/dev/cmd/Clean.rb
 - lib/dev/cmd/Commit.rb
 - lib/dev/cmd/Compile.rb
 - lib/dev/cmd/Info.rb
-- lib/dev/cmd/Pull.rb
+- lib/dev/cmd/Push.rb
 - lib/dev/cmd/Replace.rb
 - lib/dev/cmd/Setup.rb
 - lib/dev/cmd/Test.rb

data/lib/dev/cmd/Clean.rb

@@ -1,26 +0,0 @@
-require 'timeout'
-require 'tmpdir'
-
-module Dev
-module Cmd
-class Clean
-  def self.clean_tmp
-	puts_debug "Dev::Cmd::Clean.clean_temp"
-	begin
-      status=Timeout::timeout(30){
-	    puts_debug "tmp dir=#{Dir.tmpdir}"
-	    if File.exists?(Dir.tmpdir)
-	      if RUBY_PLATFORM.include?("w32")
-	        cmd="del /Q #{Dir.tmpdir.gsub('/','\\')}"
-		    puts_debug cmd
-	        `#{cmd}` if RUBY_PLATFORM.include?("w32")
-	      end
-		end
-	  }
-	rescue
-	  puts_debug "timeout met."
-	end
-  end
-end	# class Compile
-end # module Cmd
-end # module Dev

data/lib/dev/cmd/Pull.rb

@@ -1,33 +0,0 @@
-module Dev
-module Cmd
-class Pull < Array
-  def refresh
-	strip_auto_entries
-  end
-end	# class Compile
-end # module Cmd
-end # module Dev
-
-#def pull
-#    update unless has_diff
-#    array_method("pull")
-#    filename=Dir.pwd + "/rakefile.rb"
-#    puts "  updating revision variables for " + filename
-#    Dev::Svn::update_revision_variables(filename)
-#  end
-# def get_default_value_pull
-#    array=Array.new
-#      # dep,svn directives
-#      dep_hash=DEV.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
-#    array=nil if array.empty?
-#	return array
-#  end