dev_tasks 0.0.155 → 0.0.156

data/README

@@ -1,5 +1,5 @@
 =dev_tasks  {<img src="https://badge.fury.io/rb/dev_tasks.png" alt="Gem Version" />}[http://badge.fury.io/rb/dev_tasks]
-A gem that defines a set of tasks to aid in development of ruby and C# projects.
+A gem that defines a set of rake tasks to aid in the development of ruby,C# and C++ projects.
 
 ==Installation
 The gem can be installed by the single command
@@ -8,8 +8,6 @@ The gem can be installed by the single command
 ==Usage
 This is an example of a simple usage
  require 'dev_tasks'
- task :default => [:dev_tasks_default] do
- end
 
 ==Tasks
  dev_tasks performs a discovery step when it is loaded to determine

data/lib/add.rb

@@ -1,4 +1,6 @@
-class Add < Array
+require_relative './commandarray.rb'
+
+class Add < CommandArray
 
   def update
     if(Dir.exists?(".git"))
@@ -8,7 +10,4 @@ class Add < Array
 	end
   end
 
-  def add command
-    self << command if(!include?(command))
-  end
 end

data/lib/build.rb

@@ -1,10 +1,8 @@
 require_relative './color.rb'
+require_relative './commandarray.rb'
 require_relative './msbuild.rb'
 
-class Build < Array
-
-  def initialize
-  end
+class Build < CommandArray
 
   def update
     if(defined?(DEV_TASKS))
@@ -27,8 +25,4 @@ class Build < Array
 	  }
 	end
   end
-
-  def add command
-    self << command if(!include?(command))
-  end
 end

data/lib/commandarray.rb

@@ -0,0 +1,9 @@
+class CommandArray < Array
+
+  def update
+  end
+
+  def add command
+    self << command if(!include?(command))
+  end
+end

data/lib/commands.rb

@@ -14,7 +14,7 @@ class Commands < Hash
   attr_accessor :build
 
   def initialize
-    self[:pull] = Pull.new
+    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

data/lib/commit.rb

@@ -1,7 +1,7 @@
+require_relative('./commandarray.rb')
 require_relative('./environment.rb')
 
-class Commit < Array
-
+class Commit < CommandArray
   def update
     if(Dir.exists?(".git"))
 	  if(!`git status`.include?('nothing to commit') || `git status`.include?('untracked files present'))
@@ -20,8 +20,4 @@ class Commit < Array
 	  self.add "<%DEV_TASKS[:commands][:verify].update%>"
 	end
   end
-
-  def add command
-    self << command if(!include?(command))
-  end
 end

data/lib/publish.rb

@@ -1,7 +1,8 @@
+require_relative('./commandarray.rb')
 require_relative('./environment.rb')
 require_relative('./console.rb')
 
-class Publish < Array
+class Publish < CommandArray
 
   def initialize
     #if(Environment.scm=='git')

data/lib/pull.rb

@@ -1,30 +1,15 @@
+require_relative('./commandarray.rb')
 require_relative('./environment.rb')
 require 'time'
 
-class Pull < Array
-
-  def initialize
-    update
-  end
-
+class Pull < CommandArray
   def update
-    if(Environment.scm=='git')
+    if(Environment.scm=='git' && Environment.scm_origin.length > 0)
 	  if(Timer.elapsed_exceeds?("last_pull",60*60*2))
 	  #if(Timer.get_elapsed("last_pull").nil? || Timer.get_elapsed("last_pull") > 60*60*2)
 	    self.add "<%`git pull 2>&1`%>"
 	    self.add "<%Timer.set_timestamp('last_pull')%>"
 	  end
-	#  last_pull_time=nil
-	#  last_pull_time = Time.parse(File.read('log/last_pull').strip) if(File.exist?('log/last_pull'))
-	#  if(last_pull_time.nil? || (last_pull_time-Time.now) > 60*60*2)
-	#    self.add "<%`git pull 2>&1`%>"
-	#	self.add "<%Dir.mkdir('log') if(!File.exists?('log'))%>"
-	#    self.add "<%File.open('log/last_pull','w'){|f|f.puts(Time.now.to_s)}%>"
-	#  end
 	end
   end
-
-  def add command
-    self << command if(!include?(command))
-  end
 end

data/lib/push.rb

@@ -1,18 +1,10 @@
+require_relative('./push.rb')
 require_relative('./environment.rb')
 
-class Push < Array
-
-  def initialize
-    update
-  end
-
+class Push < CommandArray
   def update
     if(Environment.scm=='git')
 	  self.add "<%`git push 2>&1`%>"
 	end
   end
-
-  def add command
-    self << command if(!include?(command))
-  end
 end

data/lib/setup.rb

@@ -1,5 +1,5 @@
-
-class Setup < Array
+require_relative('./commandarray.rb')
+class Setup < CommandArray
 
   def update
     if(defined?(DEV_TASKS))
@@ -13,7 +13,4 @@ class Setup < Array
 	end
   end
 
-  def add command
-    self << command if(!include?(command))
-  end
 end

data/lib/spec.json

@@ -1 +1 @@
-{"name":"dev_tasks","version":"0.0.155"}
+{"name":"dev_tasks","version":"0.0.156"}

data/lib/test.rb

@@ -1,4 +1,6 @@
-class Test < Array
+require_relative('./commandarray.rb')
+
+class Test < CommandArray
 
   def update
     # rspec tests, 'rspec --pattern="**/*.spec"'
@@ -23,10 +25,6 @@ class Test < Array
 	end
   end
 
-  def add command
-    self << command if(!include?(command))
-  end
-
   def self.nunit_console
     "C:\\Program Files (x86)\\NUnit 2.6.3\\bin\\nunit-console.exe"
   end

data/lib/upgrade.rb

@@ -1,10 +1,7 @@
+require_relative('./commandarray.rb')
 require_relative('./environment.rb')
 
-class Upgrade < Array
-
-  def initialize
-    update
-  end
+class Upgrade < CommandArray
 
   def update
     if(Environment.scm=='git' && Environment.branch=='develop')
@@ -52,7 +49,4 @@ class Upgrade < Array
 	end
   end
 
-  def add command
-    self << command if(!include?(command))
-  end
 end

data/lib/verify.rb

@@ -1,11 +1,8 @@
+require_relative('./commandarray.rb')
 require_relative('./environment.rb')
 require_relative('./console.rb')
 
-class Verify < Array
-
-  def initialize
-    update
-  end
+class Verify < CommandArray
 
   def update
     
@@ -36,8 +33,4 @@ class Verify < Array
 	  end
 	end
   end
-
-  def add command
-    self << command if(!include?(command))
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev_tasks
 version: !ruby/object:Gem::Version
-  version: 0.0.155
+  version: 0.0.156
   prerelease: 
 platform: ruby
 authors:
@@ -101,6 +101,7 @@ files:
 - lib/artifacts.x.rb
 - lib/build.rb
 - lib/color.rb
+- lib/commandarray.rb
 - lib/commands.rb
 - lib/commit.rb
 - lib/console.rb