dev_tasks 0.0.33 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4249d898f3f655e115d83bbc99395e84dd56be6
-  data.tar.gz: 958832d8c1463c0f4962b5d9cf001b583e0f88d3
+  metadata.gz: 23a98457c480a7ce7cef8540ac4f523297e9d4ba
+  data.tar.gz: 2d3cba361183a0bb22ac5a4126a55db863aa9b7c
 SHA512:
-  metadata.gz: a31f8a599324fa3bf6dec518303faedacc6d9bec6ed902f89980d8bfcd57f1a639ad74a5e504ebcdf4eb7d5d86968554d38644847c7ebfded560ef459a07b9c9
-  data.tar.gz: a3daf7ee50ce894a1bced60a40253305bf40b03115062b30378f140d987e0ee8821540e043b1fe59e2899dece8c891afc9341122289699675759e7863e05f71b
+  metadata.gz: 8f3c65ef3d772edc925ca44a6415de4bbdfc000b625dc25ba2a7e55741e3ee8aedb6e07a1a892938bfdc98dbacad4792e7d6b0b1f0483c683b1cc70f3113d55b
+  data.tar.gz: 05f68fdd7f2b52e280581ff6b90d79b51270d3368325bf4b9dcf1036ce8e1c312d728a5daf1efce498dbe88364c83af32dd5f630b3fd3913b7e8c33f7c9525ae

data/lib/artifacts.rb

@@ -1,11 +1,12 @@
 require_relative('./dependencies.rb')
 
-class Artifacts < Hash
+class Artifacts < Array
   def initialize 
     # gem, dev_tasks-0.0.7.gem
 	Dir.glob('*.gemspec') {|f|
 	  spec=Gem::Specification.load(f)
-	  self[spec.name]="#{spec.name}-#{spec.version.to_s}.gem"
+	  artifact="#{spec.name}-#{spec.version.to_s}.gem"
+	  self << artifact if(!self.include?(artifact))
 	}
 
 	# C# dll, bin/Net4.0/QcNet.dll
@@ -16,20 +17,13 @@ class Artifacts < Hash
 	  outputPath=text[/Release[.\w\W]+<OutputPath>([\w\.\\]+)</,1]
 	  if(!assemblyName.nil? && !outputPath.nil? && !assemblyName.include?("Test"))
 		cs_dll = "#{outputPath}\\#{assemblyName}.dll".gsub("\\\\","\\").gsub('/','\\').gsub('\\','/')
-		self[assemblyName]=cs_dll
+		self << cs_dll if(!self.include?(cs_dll))
 
 		# add in file dependencies
-		deps = Dependencies.get_dependencies_from_file p
-		if(!deps.nil? && deps.has_key?(:file))
-		  deps[:file].each {|d|
-
-		    # d include to directory from which it was referenced, Visual Studio copies this to
-			# the location of cs_dll
-			cs_dll_dep=d.gsub(File.dirname(d),File.dirname(cs_dll)).gsub('\\','/')
-		    name=d.gsub('\\','/').split('/').last.gsub('.dll','')
-		    self["#{assemblyName} #{name}"] = cs_dll_dep
-		  }
-		end
+		Dependencies.csharp_file_dependencies(File.read(p)).each{|dep|
+		  cs_dll_dep=d.gsub(File.dirname(dep),File.dirname(cs_dll)).gsub('\\','/')
+		  self << cs_dll_dep if(!self.include?(cs_dll_dep))
+		}
 	  end
 	}
   end

data/lib/dependencies.rb

@@ -1,86 +1,68 @@
+# The discover method defines the following keys as appropriate:
+# :ruby a string array of discovered require statements
+# for example,
+# given rb file containing
+#   require 'json'
+#   require 'yaml'
+# the resulting dependies would be
+# dep[:ruby]=['json','yaml']
+#
+# C# dependencies are returned as a hash, as they are seperated into 
+# two groups, :system and :file
+# 
+#
 class Dependencies < Hash
 
   def initialize
-    initialize_ruby_dependencies
-	initialize_csharp_dependencies
+    discover
   end
 
-  def initialize_ruby_dependencies
-    ruby_deps = Array.new
+  def discover
+    ruby_deps=Array.new
+	cs_system_deps=Array.new
+	cs_file_deps=Array.new
     Dir.glob("**/*.rb").each{|f|
-	  text=File.read(f)
-	  text.scan(/require '([\w\/]+)/).each{|r|
-	   ruby_deps << r.first.to_s if !ruby_deps.include? r
-	  }
+      text=File.read(f)
+	  ruby_deps.zip(Dependencies.ruby_dependencies(text)).flatten.compact
+	  cs_system_deps.zip(Dependencies.csharp_system_dependencies(text)).flatten.compact
+	  cs_file_deps.zip(Dependencies.csharp_file_dependencies(text)).flatten.compact
 	}
-	if ruby_deps.length > 0
-	  ruby_deps = ruby_deps.sort
-	  self["ruby"]=ruby_deps
+	self[:ruby]=ruby_deps.sort if(ruby_deps.length>0)
+	if(cs_system_deps.length > 0 || cs_file_deps.length > 0)
+	  self["C#"]=Hash.new
+	  self["C#"][:system]=cs_system_deps.sort if(cs_system_deps.length > 0)
+	  self["C#"][:file]=cs_file_deps.sort if(cs_file_deps.length > 0)
 	end
   end
 
-  def initialize_csharp_dependencies
-    cs_dep_hash=Hash.new
-    #includes = Array.new
-	#hints = Array.new
-    Dir.glob("**/*.csproj").each{|f|
-	  #cs_proj_dep = Dependencies.get_dependencies_from_file f
-	  text=File.read(f)
-	  text.scan(/<Reference Include="([\w\.-]+)"/).each{|r|
-	   cs_dep_hash[r.first.to_s]=r.first.to_s if !cs_dep_hash.has_key? r.first.to_s
-	  }
-	  text.scan(/<HintPath>([\w\.\\\s-]+)</).each{|r|
-	   hint = r.first.to_s
-	   include = hint.split('\\').last
-	   cs_dep_hash.delete include.gsub(".dll","")
-	   cs_dep_hash[include]=hint
-	  }
+  def self.ruby_dependencies source
+    deps=Array.new
+    deps=Array.new
+    source.scan(/require '([\w\/]+)/).each{|m|
+	  dep=m.first.to_s
+	  deps << dep if(!deps.include?(dep))
 	}
-	cs_deps = Hash.new
-	cs_dep_hash.each do |include,hint|
-	  if(include==hint)
-	    cs_deps[:system]=Array.new if !cs_deps.has_key?(:system)
-		cs_deps[:system]<< hint
-	  else
-	    cs_deps[:file]=Array.new if !cs_deps.has_key?(:file)
-	    cs_deps[:file] << hint
-	  end
-	end
-	if cs_deps.length > 0
-	  cs_deps[:system]=cs_deps[:system].sort# = cs_deps.sort
-	  cs_deps[:file]=cs_deps[:file]
-	  self["C#"]=cs_deps
-	end
+	deps
   end
 
-  def self.get_dependencies_from_file filename
-    cs_dep_hash=Hash.new
-	text=File.read(filename)
-	text.scan(/<Reference Include="([\w\.-]+)"/).each{|r|
-	  cs_dep_hash[r.first.to_s]=r.first.to_s if !cs_dep_hash.has_key? r.first.to_s
-	}
-	text.scan(/<HintPath>([\w\.\\\s-]+)</).each{|r|
-	 hint = r.first.to_s
-	 include = hint.split('\\').last
-	 cs_dep_hash.delete include.gsub(".dll","")
-	 cs_dep_hash[include]=hint
+  def self.csharp_system_dependencies source
+    deps=Array.new
+    deps=Array.new
+    source.scan(/<Reference Include="([\w\.-]+)"[\s]+\//).each{|m|
+	  dep=m.first.to_s
+	  deps << dep if(!deps.include?(dep))
 	}
+	deps
+  end
 
-	cs_deps = Hash.new
-	cs_dep_hash.each do |include,hint|
-	  if(include==hint)
-	    cs_deps[:system]=Array.new if !cs_deps.has_key?(:system)
-		cs_deps[:system]<< hint
-	  else
-	    cs_deps[:file]=Array.new if !cs_deps.has_key?(:file)
-	    cs_deps[:file] << hint
-	  end
-	end
-	if cs_deps.length > 0
-	  cs_deps[:system]=cs_deps[:system].sort
-	  cs_deps[:file]=cs_deps[:file]
-	end
-	cs_deps
+  def self.csharp_file_dependencies source
+    deps=Array.new
+    deps=Array.new
+    source.scan(/<HintPath>([\w\.\\\s-]+)</).each{|m|
+	  dep=m.first.to_s
+	  deps << dep if(!deps.include?(dep))
+	}
+	deps
   end
 
   def show

data/lib/dev_tasks.rb

@@ -18,7 +18,7 @@ class DevTasks < Hash
     #hash = JSON.parse File.read("#{File.dirname(__FILE__)}/spec.json")
 	#self[:dev_tasks_gem]=JSON.parse File.read("#{File.dirname(__FILE__)}/spec.json")
 	
-	self[:name]=Rake.application.original_dir.split('/').last
+	self[:name]=pwd.split('/').last#Rake.application.original_dir.split('/').last
 	self[:scm]=Environment.scm
 	self[:branch]=Environment.branch
 	self[:relative_directory]=Environment.relative_directory

data/lib/environment.rb

@@ -28,7 +28,6 @@ class Environment < Hash
 
   def self.context
     dir =Environment.working_directory.gsub(Environment.dev_root + '/','')
-	puts "dir=" + dir
 	return dir.split('/').first
   end
 

data/lib/publish.rb

@@ -7,12 +7,12 @@ class Publish < Array
   def initialize
     if(Environment.scm=='git')
 	  artifacts=Artifacts.new
-	  artifacts.each {|k,v|
+	  artifacts.each {|artifact|
 	    dest_dir = Environment.dev_root + "/dep/" + Environment.relative_directory + '/' + Environment.branch 
-	    dest = dest_dir + "/" + v
+	    dest = dest_dir + "/" + artifact
 		dest_dir=File.dirname(dest)
 		self.add "<%FileUtils.mkdir_p('#{dest_dir}')%>" if (!Dir.exists?(dest_dir))
-		self.add "<%FileUtils.cp('#{v}','#{dest}')%>"
+		self.add "<%FileUtils.cp('#{artifact}','#{dest}')%>"
 	  }
 	end
   end

data/lib/spec.json

@@ -1 +1 @@
-{"name":"dev_tasks","version":"0.0.33"}
+{"name":"dev_tasks","version":"0.0.34"}

data/lib/test.rb

@@ -3,7 +3,7 @@ class Test < Array
   def initialize
     # rspec tests, 'rspec --pattern="**/*.spec"'
 	if(Dir.glob("**/*spec.rb").length > 0)
-	  self.add 'rspec --pattern="**/*.spec"'
+	  self.add 'rspec'
 	end
 	# nunit tests, 'nunit-console.exe "C::\\Projects\\MyProjects\\bin\\Release\\MyLib.Test.dll"'
 	if File.exist? Test.nunit_console

data/lib/upgrade.rb

@@ -3,12 +3,9 @@ require_relative('./environment.rb')
 class Upgrade < Array
 
   def initialize
-    puts "Upgrade discovery"
     if(Environment.scm=='git' && Environment.branch=='develop')
 	  Dir.glob('dep/**/*.dll').each {|f|
 	    src=Environment.dev_root + "/" + f
-		puts "source: " + src
-		puts "  dest: " + f + " " + File.mtime(f).to_s
 		if(File.exist?(src) && File.mtime(src) > File.mtime(f))
 		  self.add "<%FileUtils.cp('#{src}','#{f}')%>"
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev_tasks
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.34
 platform: ruby
 authors:
 - Lou Parslow