dev_tasks 1.0.29 → 1.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b525e1a836ab479104310c4f643bbd5fdac4028
-  data.tar.gz: e92dcd30d389e592822308079eef34ea17d19af6
+  metadata.gz: db922a39250ac09b7944b49bfc4fc4e9d8763833
+  data.tar.gz: 247d97acea28c9e29f089e117c026d2cc9f07ef9
 SHA512:
-  metadata.gz: 980388176e65095ebbb4cdb2f14cc47755ad1849d89fcc2f489960fcb3c36bc1ec2ad13b2f8034d1efb8a16c9d2f026ff261557bb0edf588125cc6452eb5ab55
-  data.tar.gz: 1020fca97e00a4cc26d49291727219308a547d4ab37097482906b7013420bef638570aecc4629c8d0a13f58bd265bb48cf31a61f55a5f9e6ecd33bc670c163b0
+  metadata.gz: 4c98904b25f75b7fb9fcf6a9759a2af7b9eb5a45a03fd3123fefcf438f1f355505c8d237803bfc2dde4e94c354c63b9dcdab7329125ff33954bfaab3c8321007
+  data.tar.gz: 01b30177a4042eb7a51cd08a587e59664499f6447d3a22cbd0f76923d910deadc1970bbda747fa0dce24c463efbb2cc6fdbc0e00cb7433a1e1677370eb95b739

data/lib/commandarray.rb

@@ -1,21 +1,21 @@
-require_relative './command.rb'
+#require_relative './command.rb'
 
 class CommandArray < Array
 
-  def update
-  end
+  #def update
+  #end
 
   def add command
     self << command if(!include?(command))
   end
 
-  def execute
-  	i=0
-  	while i < self.length
-  		self[i]=Command.new(self[i]) if(self[i].is_a?(String))
-  		self[i].execute
-  		i=i+1
-  	end
-  end
+#  def execute
+#  	i=0
+#  	while i < self.length
+#  		self[i]=Command.new(self[i]) if(self[i].is_a?(String))
+#  		self[i].execute
+#  		i=i+1
+#  	end
+#  end
 
 end

data/lib/commands.rb

@@ -1,63 +1,63 @@
-require_relative './build.rb'
-require_relative './test.rb'
-require_relative './add.rb'
-require_relative './commit.rb'
-require_relative './publish.rb'
-require_relative './pull.rb'
-require_relative './push.rb'
-require_relative './setup.rb'
-require_relative './upgrade.rb'
-require_relative './timer.rb'
-require_relative './verify.rb'
-
-class Commands < Hash
-  attr_accessor :build
-
-  def initialize
-    self[:pull] = Pull.new if(Environment.scm=='git' && Environment.scm_origin.length > 0)
-    self[:upgrade] = Upgrade.new
-	self[:setup] = Setup.new
-    self[:build] = Build.new
-	self[:test] = Test.new
-	self[:add] = Add.new
-	self[:commit] = Commit.new
-	self[:push] = Push.new
-	self[:verify] = Verify.new
-	self[:publish] = Publish.new
-  end
-
-  def update
-    self[:upgrade].update
-	self[:setup].update
-	self[:build].update
-	self[:verify].update
-	self[:publish].update
-  end
-
-  def execute_task task
-    sym_task = task.to_sym
-    if(self.has_key?(sym_task))
-		self[sym_task].update
-		if(self[sym_task].length>0)
-			Logger.start_task task 
-			self[sym_task].execute
-			Logger.end_task task
-		else
-			self.delete sym_task
-		end
-    end	
-  end
-
-
-  def show
-    self.each do |key,array|
-	  if(array.length > 0)
-	    puts key
-	    array.each {|v|
-	      puts "  " + Color.green + v + Color.clear + " "
-	    }
-	  end
-	end
-	puts " "
-  end
+require_relative './build.rb'
+require_relative './test.rb'
+require_relative './add.rb'
+require_relative './commit.rb'
+require_relative './publish.rb'
+require_relative './pull.rb'
+require_relative './push.rb'
+require_relative './setup.rb'
+require_relative './upgrade.rb'
+require_relative './timer.rb'
+require_relative './verify.rb'
+
+class Commands < Hash
+  attr_accessor :build
+
+  def initialize
+    self[:pull] = Pull.new if(Environment.scm=='git' && Environment.scm_origin.length > 0)
+    self[:upgrade] = Upgrade.new
+	self[:setup] = Setup.new
+    self[:build] = Build.new
+	self[:test] = Test.new
+	self[:add] = Add.new
+	self[:commit] = Commit.new
+	self[:push] = Push.new
+	self[:verify] = Verify.new
+	self[:publish] = Publish.new
+  end
+
+  def update
+    self[:upgrade].update
+	self[:setup].update
+	self[:build].update
+	self[:verify].update
+	self[:publish].update
+  end
+
+  def execute_task task
+    sym_task = task.to_sym
+    if(self.has_key?(sym_task))
+		self[sym_task].update if self[sym_task].respond_to?(:update)
+		if(self[sym_task].length>0)
+			Logger.start_task task 
+			self[sym_task].execute
+			Logger.end_task task
+		else
+			self.delete sym_task
+		end
+    end	
+  end
+
+
+  def show
+    self.each do |key,array|
+	  if(array.length > 0)
+	    puts key
+	    array.each {|v|
+	      puts "  " + Color.green + v + Color.clear + " "
+	    }
+	  end
+	end
+	puts " "
+  end
 end

data/lib/dev_tasks.rb

@@ -1,6 +1,7 @@
 require 'rake' 
 require 'rake/clean'
 require 'json'
+require 'dev_commands'
 require 'dev_environment'
 include Rake::DSL
 

data/lib/environment.rb

@@ -2,18 +2,15 @@
 
 class Environment #S< Hash#.class_eval do #< Hash do
 
-  def initialize
-  end
-
   def self.scm
     return "git" if(Dir.exists?(".git"))
-	return "svn" if(Dir.exists?(".svn"))
-	"none"
+	  return "svn" if(Dir.exists?(".svn"))
+	  "none"
   end
 
   def self.copy src,dest
     FileUtils.mkdir_p File.dirname(dest) if !File.exists?(File.dirname(dest))
-	FileUtils.cp(src,dest)
+	  FileUtils.cp(src,dest)
   end
 
   def self.copy_files files,dest
@@ -59,40 +56,6 @@ class Environment #S< Hash#.class_eval do #< Hash do
 	"0"
   end
 
-  def self.dev_root
-    ["DEV_HOME","DEV_ROOT"].each {|v|
-	    return ENV[v].gsub('\\','/') unless ENV[v].nil?
-	  }
-    dir=home
-    dir=ENV["DEV_ROOT"].gsub('\\','/') unless ENV["DEV_ROOT"].nil?
-	 return dir
-  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.machine
-     if !ENV['COMPUTERNAME'].nil? 
-	   return ENV['COMPUTERNAME']
-	 end
-
-     machine = `hostname`
-     machine = machine.split('.')[0] if machine.include?('.')
-	 return machine.strip
-  end
-
-  def self.user
-  	return ENV['USER'] if !ENV['USER'].nil?  #on Unix
-    ENV['USERNAME']
-  end
-
   def self.working_directory
     Rake.application.original_dir
   end
@@ -153,10 +116,10 @@ class Environment #S< Hash#.class_eval do #< Hash do
 	end
   end
 
-  def self.execute(cmd)
-    timer=Timer.new
-    puts "executing " + cmd
-	puts `#{cmd}`
-	puts timer.elapsed_str
-  end
+ # def self.execute(cmd)
+ #   timer=Timer.new
+ #   puts "executing " + cmd
+#	puts `#{cmd}`
+#	puts timer.elapsed_str
+#  end
 end

data/lib/spec.json

@@ -1 +1 @@
-{"name":"dev_tasks","version":"1.0.29"}
+{"name":"dev_tasks","version":"1.0.30"}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev_tasks
 version: !ruby/object:Gem::Version
-  version: 1.0.29
+  version: 1.0.30
 platform: ruby
 authors:
 - Lou Parslow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dev_commands
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: dev_environment
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dev_commands
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: defines rake tasks for ruby and C# projects
 email: lou.parslow@gmail.com
 executables: []
@@ -118,7 +146,6 @@ files:
 - lib/artifacts.x.rb
 - lib/build.rb
 - lib/color.rb
-- lib/command.rb
 - lib/commandarray.rb
 - lib/commands.rb
 - lib/commit.rb
@@ -144,7 +171,6 @@ files:
 - lib/verify.rb
 - lib/yamllog.rb
 - lib/spec.json
-- spec/command_spec.rb
 - spec/dependencies_spec.rb
 - spec/dev_tasks_spec.rb
 - spec/environment_spec.rb

data/lib/command.rb

@@ -1,59 +0,0 @@
-class Command < Hash
-	def initialize command
-
-		if(command.kind_of?(String))
-		  self[:input] = command
-		  self[:timeout] = 0
-		  self[:directory] = ''
-		  self[:exit_code] = 0
-		  self[:output] = ''
-		  self[:error] = ''
-		  self[:machine_name] = ''
-		  self[:user_name] = ''
-		  self[:start_time] = nil
-		  self[:end_time] = nil
-        end
-
-        if(command.kind_of?(Hash))
-        	command.each{|k,v|
-        		self[k.to_sym]=v
-        	}
-        end
-	end
-
-	def execute
-
-		Logger.start_command self
-
-		pwd=Dir.pwd
-		Dir.chdir(self[:directory]) if(self.has_key?(:directory) && File.exists?(self[:directory]))
-		#print " " + Color.green + self[:input] + Color.clear
-
-		self[:start_time]=Time.now
-		timer=Timer.new
-		if self[:input].include?('<%') && self[:input].include?('%>')
-		  ruby = self[:input].gsub("<%","").gsub("%>","")
-
-		  begin
-		  	puts "eval(#{ruby})"
-		    self[:output]=eval(ruby)
-		  rescue
-		  	puts "unable to eval(#{ruby})"
-		  	raise "unable to eval(#{ruby})"
-		  end
-
-		  #puts " " + timer.elapsed_str
-		  self[:elapsed] = timer.elapsed_str
-		  self[:end_time] = Time.now
-		else
-			self[:output] = `#{self[:input]}`
-			self[:elapsed] = timer.elapsed_str
-			self[:end_time] = Time.now
-			self[:exit_code]=$?.to_i
-		end
-
-        Dir.chdir(pwd) if pwd != Dir.pwd
-		Logger.end_command self
-	end
-
-end

data/spec/command_spec.rb

@@ -1,80 +0,0 @@
-require_relative '../lib/command.rb'
-
-describe Command do
-  it "should be able to execute ruby --version command" do
-    cmd=Command.new("ruby --version")
-    # Timeout
-    expect(cmd[:timeout]).to eq(0)
-    cmd[:timeout]=3000
-    expect(cmd[:timeout]).to eq(3000)
-
-    # Directory
-    expect(cmd[:directory]).to eq("")
-    cmd[:directory] = File.dirname(__FILE__)
-    expect(cmd[:directory]).to eq(File.dirname(__FILE__))
-
-    # ExitCode
-    expect(cmd[:exit_code]).to eq(0)
-    cmd[:exit_code] = 1
-    expect(cmd[:exit_code]).to eq(1)
-
-    # Input
-    expect(cmd[:input]).to eq("ruby --version")
-    cmd2 = Command.new('')
-    expect(cmd2[:input]).to eq('')
-
-    # Output
-    expect(cmd[:output]).to eq('')
-    cmd[:output]='test'
-    expect(cmd[:output]).to eq('test')
-
-    # Error
-    expect(cmd[:error]).to eq('')
-    cmd[:error]='error_test'
-    expect(cmd[:error]).to eq('error_test')
-
-    # MachineName
-    expect(cmd[:machine_name]).to eq('')
-    cmd[:machine_name]='machine_name_test'
-    expect(cmd[:machine_name]).to eq('machine_name_test')
-
-    # UserName
-    expect(cmd[:user_name]).to eq('')
-    cmd[:user_name]='user_name_test'
-    expect(cmd[:user_name]).to eq('user_name_test')
-
-    # StartTime
-    expect(cmd[:start_time]).to eq(nil)
-    cmd[:start_time]=Time.now
-    expect(cmd[:start_time]).not_to eq(nil)
-
-    # EndTime
-    expect(cmd[:end_time]).to eq(nil)
-    cmd[:end_time]=Time.now
-    expect(cmd[:end_time]).not_to eq(nil)
-
-  end
-
-  it "should be able to write to/load from JSON" do
-    cmd=Command.new("ruby --version")
-    expect(cmd[:timeout]).to eq(0)
-    expect(cmd[:input]).to eq("ruby --version")
-    cmd2=Command.new(JSON.parse(cmd.to_json))
-    expect(cmd2[:timeout]).to eq(0)
-    expect(cmd2[:input]).to eq("ruby --version")
-  end
-
-  it "should be able to execute rake command in specific directory" do
-    dir="#{DEV[:dev_root]}/tmp/rake_test"
-    FileUtils.mkdir_p(dir) if(!File.exists?(dir))
-    File.open("#{dir}/rakefile.rb","w") { |f| 
-        f.puts "task :default do"
-        f.puts " puts 'rake_test'"
-        f.puts "end" 
-    }
-    cmd=Command.new("rake")
-    cmd[:directory]=dir
-    cmd.execute
-    expect(cmd[:output].include?('rake_test')).to eq(true)
-  end
-end