dev_commands 0.0.25 → 0.0.26

data/lib/gemspec.rb

@@ -1,36 +1,36 @@
-class Gemspec
-	def self.update gemspec_file
-		Text.replace_in_file gemspec_file,
-                              /('\d{4}-\d{2}-\d{2}')/,
-                              "'#{Time.now.strftime('%Y-%m-%d')}'"
-	end
-
-	def self.gemfile gemspec_file
-		spec=Gem::Specification.load(gemspec_file)
-		return "#{spec.name}-#{spec.version}.gem"
-	end
-
-    def self.version gemspec_file
-    	spec=Gem::Specification.load(gemspec_file)
-		return spec.version.to_s
-    end
-
-    def self.published_version gemspec_file
-  		published_version=''
-    	spec=Gem::Specification.load(gemspec_file)
-		begin
-		  published_version = `gem list #{spec.name} -r`.scan(/\((\d+.\d+.\d+)\)/)[0][0]
-		rescue
-		  published_version=''
-		end
-		published_version
-    end
-	def self.published? gemspec_file
-		published_version(gemspec_file)==version(gemspec_file) ? true : false
-	end
-
-	def self.normalize gemspec_file
-		spec=Gem::Specification.load(gemspec_file)
-		File.open(gemspec_file,'w'){|f|f.write(spec.to_ruby)}
-	end
+class Gemspec
+	def self.update gemspec_file
+		Text.replace_in_file gemspec_file,
+                              /('\d{4}-\d{2}-\d{2}')/,
+                              "'#{Time.now.strftime('%Y-%m-%d')}'"
+	end
+
+	def self.gemfile gemspec_file
+		spec=Gem::Specification.load(gemspec_file)
+		return "#{spec.name}-#{spec.version}.gem"
+	end
+
+    def self.version gemspec_file
+    	spec=Gem::Specification.load(gemspec_file)
+		return spec.version.to_s
+    end
+
+    def self.published_version gemspec_file
+  		published_version=''
+    	spec=Gem::Specification.load(gemspec_file)
+		begin
+		  published_version = `gem list -r #{spec.name} -r`.scan(/\((\d+.\d+.\d+)\)/)[0][0]
+		rescue
+		  published_version=''
+		end
+		published_version
+    end
+	def self.published? gemspec_file
+		published_version(gemspec_file)==version(gemspec_file) ? true : false
+	end
+
+	def self.normalize gemspec_file
+		spec=Gem::Specification.load(gemspec_file)
+		File.open(gemspec_file,'w'){|f|f.write(spec.to_ruby)}
+	end
 end

data/lib/git.rb

@@ -1,9 +1,9 @@
-class Git
-	def self.branch
-		begin
-		  `git branch`.scan(/\* ([.\w-]+)/)[0][0]
-	    rescue
-	    	''
-	    end
-    end
+class Git
+	def self.branch
+		begin
+		  `git branch`.scan(/\* ([.\w-]+)/)[0][0]
+	    rescue
+	    	''
+	    end
+    end
 end

data/lib/hash.rb

@@ -1,21 +1,21 @@
-class Hash
-	def execute
-	  self.each{|k,v|
-      v.update if v.respond_to?(:update)
-      if(v.is_a?(Array) && v.length==0)
-        self.delete k 
-      else
-        #puts "executing #{k}"
-
-	  	  v.execute if v.respond_to?(:execute)
-      end
-	  }
-    end
-	def to_html
-      [
-      	'<div>',
-        map { |k, v| ["<br/><div><strong>#{k}</strong>", v.respond_to?(:to_html) ? v.to_html : "<span>#{v}</span></div><br/>"] },
-        '</div>'
-      ].join
-    end
+class Hash
+	def execute
+	  self.each{|k,v|
+      v.update if v.respond_to?(:update)
+      if(v.is_a?(Array) && v.length==0)
+        self.delete k 
+      else
+        #puts "executing #{k}"
+
+	  	  v.execute if v.respond_to?(:execute)
+      end
+	  }
+    end
+	def to_html
+      [
+      	'<div>',
+        map { |k, v| ["<br/><div><strong>#{k}</strong>", v.respond_to?(:to_html) ? v.to_html : "<span>#{v}</span></div><br/>"] },
+        '</div>'
+      ].join
+    end
 end

data/lib/internet.rb

@@ -0,0 +1,17 @@
+require 'open-uri'
+
+class Internet
+
+	@@available=nil
+
+	def self.available?
+		return @@available if !@@available.nil?
+
+		begin
+			@@available = true if open('http://www.google.com')
+		rescue
+			@@available = false
+		end
+		@@available
+	end
+end

data/lib/msbuild.rb

@@ -8,6 +8,24 @@ class MSBuild < Hash
     self[:vs9]="C:\\Windows\\Microsoft.NET\\Framework\\v3.5\\msbuild.exe"  if(File.exists?("C:\\Windows\\Microsoft.NET\\Framework\\v3.5\\msbuild.exe"))
     self[:vs12]="C:\\Program Files (x86)\\MSBuild\\12.0\\bin\\msbuild.exe" if(File.exists?("C:\\Program Files (x86)\\MSBuild\\12.0\\bin\\msbuild.exe"))
   end
+  
+  def self.has_version? version
+    if(defined?(MSBUILD))
+      MSBUILD.has_key?(version)
+    else
+      msb=MSBuild.new
+      return msb.has_key? version
+    end
+  end
+
+  def self.get_version version
+    if(defined?(MSBUILD))
+      MSBUILD[version]
+    else
+      msb=MSBuild.new
+      return msb[version]
+    end
+  end
 
 	def self.get_vs_version(sln_filename)
    		sln_text=File.read(sln_filename,:encoding=>'UTF-8')

data/lib/publish.rb

@@ -1,7 +1,10 @@
-class Publish < Array
-	def update
-		Dir.glob('*.gemspec').each{|gemspec_file|
-			add "gem push #{Gemspec.gemfile(gemspec_file)}" if !Gemspec.published? gemspec_file
-		}
-	end
+require_relative('internet.rb')
+class Publish < Array
+	def update
+		if(Internet.available?)
+			Dir.glob('*.gemspec').each{|gemspec_file|
+				add "gem push #{Gemspec.gemfile(gemspec_file)}" if !Gemspec.published? gemspec_file
+			}
+		end
+	end
 end

data/lib/pull.rb

@@ -1,9 +1,12 @@
 require_relative('git.rb')
+require_relative('internet.rb')
 
 class Pull < Array
 	def update
-		if(File.exists?('.git') && `git config --list`.include?('user.name='))
-			self <<  'git pull' if Git.branch != 'develop'
+		if(Internet.available?)
+			if(File.exists?('.git') && `git config --list`.include?('user.name='))
+				self <<  'git pull' if Git.branch != 'develop'
+			end
 		end
 	end
 end

data/lib/push.rb

@@ -1,8 +1,9 @@
-class Push < Array
-	def update
-		if(File.exists?('.git') && `git config --list`.include?('user.name='))
-			add 'git config --global push.default simple'
-			self <<  'git push' if Git.branch != 'develop'
-		end
-	end
+require_relative('internet.rb')
+class Push < Array
+	def update
+		if(File.exists?('.git') && `git config --list`.include?('user.name='))
+			add 'git config --global push.default simple'
+			self <<  'git push' if Git.branch != 'develop' && Internet.available?
+		end
+	end
 end

data/lib/setup.rb

@@ -1,9 +1,25 @@
-class Setup < Array
-	def update
-		add 'bundle install' if(File.exists?('Gemfile'))
-
-		Dir.glob('*.gemspec').each{|gemspec_file|
-			add "<%Gemspec.update('#{gemspec_file}')%>"
-		}
-	end
+#
+# use the SVN_EXPORTS hash to define svn exports destined for DEV_ROOT/dep
+#
+# SVN_EXPORT={ 'System.Data.SQLite/1.0.93.0' => 'https://third-party.googlecode.com/svn/trunk/System.Data.SQLite/1.0.93.0' }
+#
+class Setup < Array
+	def update
+		add 'bundle install' if(File.exists?('Gemfile'))
+
+		Dir.glob('*.gemspec').each{|gemspec_file|
+			add "<%Gemspec.update('#{gemspec_file}')%>"
+		}
+
+		if(defined?(SVN_EXPORTS))
+			SVN_EXPORTS.each{|k,v|
+				if(!File.exists?("#{Command.dev_root}/dep/#{k}"))
+			      FileUtils.mkdir_p(File.dirname("#{Command.dev_root}/dep/#{k}")) if !File.exists?("#{Command.dev_root}/dep/#{k}")
+				  dest="#{Command.dev_root}/dep/#{k}"
+			      add "svn export #{v} #{Command.dev_root}/dep/#{k}" if !dest.include?("@")
+				  add "svn export #{v} #{Command.dev_root}/dep/#{k}@" if dest.include?("@")
+		        end
+			}
+		end
+	end
 end

data/lib/test.rb

@@ -1,5 +1,50 @@
-class Test < Array
-	def update
-		add 'rspec' if File.exists?('spec')
-	end
+#
+# nunit dlls may be specified with
+# NUNIT=FileList.new('**/*.Test.dll')
+#
+# for nunit dlls that must be run in x86 mode,
+# NUNIT_x86=FileList.new('**/*.x86.Test.dll')
+#
+class Test < Array
+	def update
+		add 'rspec' if File.exists?('spec')
+
+		if(defined?(NUNIT))
+			NUNIT.each{|nunit_dll|
+				add "\"#{Test.nunit_console}\" \"#{Rake.application.original_dir}\\#{nunit_dll}\" /xml:\"#{nunit_dll}.TestResults.xml\""
+			}
+		end
+
+		if(defined?(NUNIT_X86))
+			NUNIT_X86.each{|nunit_dll|
+				add "\"#{Test.nunit_console_x86}\" \"#{Rake.application.original_dir}\\#{nunit_dll}\" /xml:\"#{nunit_dll}.TestResults.xml\""
+			}
+		end
+	end
+
+    @@nunit_console=''
+	def self.nunit_console
+		if(!File.exists?(@@nunit_console))
+			@@nunit_console = NUNIT_CONSOLE if(defined(NUNIT_CONSOLE))
+			@@nunit_console = "C:\\Program Files (x86)\\NUnit 2.6.4\\bin\\nunit-console.exe" if(!File.exists?(@@nunit_console))
+			@@nunit_console = "C:\\Program Files (x86)\\NUnit 2.6.3\\bin\\nunit-console.exe" if(!File.exists?(@@nunit_console))
+		end
+		if(!File.exists?(@@nunit_console))
+			raise "unable to locate nunit-console.exe, assign NUNIT_CONSOLE to the correct location."
+		end
+		@@nunit_console
+	end
+
+	@@nunit_console_x86=''
+	def self.nunit_console_x86
+		if(!File.exists?(@@nunit_console_x86))
+			@@nunit_console_x86 = NUNIT_CONSOLE_X86 if(defined(NUNIT_CONSOLE_X86))
+			@@nunit_console_x86 = "C:\\Program Files (x86)\\NUnit 2.6.4\\bin\\nunit-console-x86.exe" if(!File.exists?(@@nunit_console_x86))
+			@@nunit_console_x86 = "C:\\Program Files (x86)\\NUnit 2.6.3\\bin\\nunit-console-x86.exe" if(!File.exists?(@@nunit_console_x86))
+		end
+		if(!File.exists?(@@nunit_console_x86))
+			raise "unable to locate nunit-console-x86.exe, assign NUNIT_CONSOLE_X86 to the correct location."
+		end
+		@@nunit_console_x86
+	end
 end

data/lib/text.rb

@@ -1,15 +1,15 @@
-class Text
-  def self.replace_in_glob(glob,search,replace)
-     Dir.glob(glob).each{ |f| replace_text_in_file(f,search,replace) }
-   end
-   
-   def self.replace_in_file(filename,search,replace)
-     text1 = IO.read(filename).force_encoding("ISO-8859-1").encode("utf-8", replace: nil)
-     #File.read(f,:encoding=>'UTF-8')
-     text2 = text1.gsub(search) { |str| str=replace }
-     unless text1==text2
-       File.open(filename,"w") { |f| f.puts text2 }
-     end
-   end
-
+class Text
+  def self.replace_in_glob(glob,search,replace)
+     Dir.glob(glob).each{ |f| replace_in_file(f,search,replace) }
+   end
+   
+   def self.replace_in_file(filename,search,replace)
+     text1 = IO.read(filename).force_encoding("ISO-8859-1").encode("utf-8", replace: nil)
+     #File.read(f,:encoding=>'UTF-8')
+     text2 = text1.gsub(search) { |str| str=replace }
+     unless text1==text2
+       File.open(filename,"w") { |f| f.puts text2 }
+     end
+   end
+
 end

data/lib/timer.rb

@@ -1,41 +1,41 @@
-class Timer
-  attr_accessor :start_time
-
-  def initialize
-    @start_time=Time.now
-  end
-
-  def elapsed # in seconds
-    return Time.now-@start_time
-  end
-
-  def elapsed_str
-    elapsed_str="[" + "%.0f" %(elapsed) + "s]"
-  end
-
-  def self.elapsed_exceeds?(name,duration_seconds)
-    if(Timer.get_elapsed(name).nil? || Timer.get_elapsed(name) > duration_seconds)
-	  return true
-	end
-	return false
-  end
-
-  def self.get_elapsed(name)
-    timestamp=get_timestamp(name)
-	return Time.now-timestamp if(!timestamp.nil?)
-	nil
-  end
-
-  def self.get_timestamp(name)
-    dir=Rake.application.original_dir
-    if(File.exists?("#{DEV[:dev_root]}/log/#{name}.timestamp"))
-      return Time.parse(File.read("#{DEV[:dev_root]}/log/#{name}.timestamp").strip)
-	end
-	nil
-  end
-
-  def self.set_timestamp(name)
-    Dir.mkdir("#{DEV_TASKS[:dev_root]}/log") if(!Dir.exists?("#{DEV_TASKS[:dev_root]}/log"))
-    File.open("#{DEV_TASKS[:dev_root]}/log/#{name}.timestamp",'w'){|f|f.puts(Time.now.to_s)}
-  end
+class Timer
+  attr_accessor :start_time
+
+  def initialize
+    @start_time=Time.now
+  end
+
+  def elapsed # in seconds
+    return Time.now-@start_time
+  end
+
+  def elapsed_str
+    elapsed_str="[" + "%.0f" %(elapsed) + "s]"
+  end
+
+  def self.elapsed_exceeds?(name,duration_seconds)
+    if(Timer.get_elapsed(name).nil? || Timer.get_elapsed(name) > duration_seconds)
+	  return true
+	end
+	return false
+  end
+
+  def self.get_elapsed(name)
+    timestamp=get_timestamp(name)
+	return Time.now-timestamp if(!timestamp.nil?)
+	nil
+  end
+
+  def self.get_timestamp(name)
+    dir=Rake.application.original_dir
+    if(File.exists?("#{DEV[:dev_root]}/log/#{name}.timestamp"))
+      return Time.parse(File.read("#{DEV[:dev_root]}/log/#{name}.timestamp").strip)
+	end
+	nil
+  end
+
+  def self.set_timestamp(name)
+    Dir.mkdir("#{DEV_TASKS[:dev_root]}/log") if(!Dir.exists?("#{DEV_TASKS[:dev_root]}/log"))
+    File.open("#{DEV_TASKS[:dev_root]}/log/#{name}.timestamp",'w'){|f|f.puts(Time.now.to_s)}
+  end
 end

data/lib/update.rb

@@ -1,5 +1,6 @@
+require_relative('internet.rb')
 class Update < Array
 	def update
-		self .add 'svn update' if File.exists?('.svn')
+		self .add 'svn update' if File.exists?('.svn') && Internet.available?
 	end
 end

data/spec/command_spec.rb

@@ -1,110 +1,110 @@
-require_relative '../lib/command.rb'
-require 'json'
-require 'fileutils'
-
-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')
-
-    # Machine
-    expect(cmd[:machine]).to eq('')
-    cmd[:machine]='machine_test'
-    expect(cmd[:machine]).to eq('machine_test')
-
-    # User
-    expect(cmd[:user]).to eq('')
-    cmd[:user]='user_test'
-    expect(cmd[:user]).to eq('user_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="#{File.dirname(__FILE__)}/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
-    FileUtils.rm_r("#{File.dirname(__FILE__)}/tmp")
-    expect(cmd[:output].include?('rake_test')).to eq(true)
-  end
-
-  it "should be able to execute an array of commands" do
-    help=['git --help','rake --help','ruby --help']
-    help.execute
-    File.open('help.html','w'){|f|f.write(help.to_html)}
-  end
-
-  it "should be able to execute a hash with arrays or commands" do
-    commands=Hash.new
-    commands[:help]=['git --help','rake --help','ruby --help']
-    commands[:version]=['git --version','rake --version','ruby --version']
-    commands.execute
-    File.open('commands.html','w'){|f|f.write(commands.to_html)}
-  end
-
-  it "hsould be able to get the output" do
-    expect(Command.output('git --version').include?('git version')).to eq(true)
-    expect(Command.output('bogus --version').include?('bogus version')).to eq(false)
-  end
-
-  it "should be able to get the exit_code" do
-    expect(Command.exit_code('rake --version')).to eq(0)
-    expect(Command.exit_code('bogus --version')).not_to eq(0)
-  end
-  #it "should fail this test" do
-  #  expect(false).to eq(true)
-  #end
+require_relative '../lib/command.rb'
+require 'json'
+require 'fileutils'
+
+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')
+
+    # Machine
+    expect(cmd[:machine]).to eq('')
+    cmd[:machine]='machine_test'
+    expect(cmd[:machine]).to eq('machine_test')
+
+    # User
+    expect(cmd[:user]).to eq('')
+    cmd[:user]='user_test'
+    expect(cmd[:user]).to eq('user_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="#{File.dirname(__FILE__)}/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
+    FileUtils.rm_r("#{File.dirname(__FILE__)}/tmp")
+    expect(cmd[:output].include?('rake_test')).to eq(true)
+  end
+
+  it "should be able to execute an array of commands" do
+    help=['git --help','rake --help','ruby --help']
+    help.execute
+    File.open('help.html','w'){|f|f.write(help.to_html)}
+  end
+
+  it "should be able to execute a hash with arrays or commands" do
+    commands=Hash.new
+    commands[:help]=['git --help','rake --help','ruby --help']
+    commands[:version]=['git --version','rake --version','ruby --version']
+    commands.execute
+    File.open('commands.html','w'){|f|f.write(commands.to_html)}
+  end
+
+  it "hsould be able to get the output" do
+    expect(Command.output('git --version').include?('git version')).to eq(true)
+    expect(Command.output('bogus --version').include?('bogus version')).to eq(false)
+  end
+
+  it "should be able to get the exit_code" do
+    expect(Command.exit_code('rake --version')).to eq(0)
+    expect(Command.exit_code('bogus --version')).not_to eq(0)
+  end
+  #it "should fail this test" do
+  #  expect(false).to eq(true)
+  #end
 end