dev_commands 0.0.49 → 0.0.50

data/lib/doc.rb

@@ -1,9 +1,9 @@
-class Doc < Array
-	def update
-		#cmd=Command.new ({ :input => 'yard --version', :ignore_failure => true})
-		#cmd.execute
-		if(Command.exit_code('yard --version'))
-		  add 'yard doc - LICENSE' if File.exists?('README.md') && File.exists?('LICENSE')
-		end
-	end
+class Doc < Array
+	def update
+		#cmd=Command.new ({ :input => 'yard --version', :ignore_failure => true})
+		#cmd.execute
+		if(Command.exit_code('yard --version'))
+		  add 'yard doc - LICENSE' if File.exists?('README.md') && File.exists?('LICENSE')
+		end
+	end
 end

data/lib/gemspec.rb

@@ -1,39 +1,39 @@
-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}`.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
-
-	def self.upgrade gemspec_file
-	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}`.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
+
+	def self.upgrade gemspec_file
+	end
 end

data/lib/git.rb

@@ -1,22 +1,22 @@
-class Git
-	def self.branch
-		begin
-		  `git branch`.scan(/\* ([.\w-]+)/)[0][0]
-	    rescue
-	    	''
-	    end
-    end
-
-    def self.remote_origin directory=''
-    	url=''
-    	directory=Dir.pwd if directory.length == 0
-    	Dir.chdir(directory) do
-    		begin
-    			url=`git remote show origin`.scan(/Fetch URL: ([\.\-:\/\w\d]+)/)[0]
-    		rescue
-    			url=''
-    		end
-    	end
-    	url
-    end
+class Git
+	def self.branch
+		begin
+		  `git branch`.scan(/\* ([.\w-]+)/)[0][0]
+	    rescue
+	    	''
+	    end
+    end
+
+    def self.remote_origin directory=''
+    	url=''
+    	directory=Dir.pwd if directory.length == 0
+    	Dir.chdir(directory) do
+    		begin
+    			url=`git remote show origin`.scan(/Fetch URL: ([\.\-:\/\w\d]+)/)[0]
+    		rescue
+    			url=''
+    		end
+    	end
+    	url
+    end
 end

data/lib/hash.rb

@@ -1,21 +1,21 @@
-class Hash
-	def execute value=nil
-	  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(value) 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 value=nil
+	  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(value) 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

@@ -1,17 +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
+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/publish.rb

@@ -1,21 +1,21 @@
-require_relative('internet.rb')
-class Publish < Array
-	def update
-		if(Internet.available?)
-			if(File.exists?('.git'))
-				if(`git branch`.include?('* master'))
-					Dir.glob('*.gemspec').each{|gemspec_file|
-						add "gem push #{Gemspec.gemfile(gemspec_file)}" if !Gemspec.published? gemspec_file
-					}
-				end
-			end
-			if(File.exists?('.svn'))
-				if(`svn info`.include?('/trunk'))
-					Dir.glob('*.gemspec').each{|gemspec_file|
-						add "gem push #{Gemspec.gemfile(gemspec_file)}" if !Gemspec.published? gemspec_file
-					}
-				end
-			end
-		end
-	end
-end
+require_relative('internet.rb')
+class Publish < Array
+	def update
+		if(Internet.available?)
+			if(File.exists?('.git'))
+				if(`git branch`.include?('* master'))
+					Dir.glob('*.gemspec').each{|gemspec_file|
+						add "gem push #{Gemspec.gemfile(gemspec_file)}" if !Gemspec.published? gemspec_file
+					}
+				end
+			end
+			if(File.exists?('.svn'))
+				if(`svn info`.include?('/trunk'))
+					Dir.glob('*.gemspec').each{|gemspec_file|
+						add "gem push #{Gemspec.gemfile(gemspec_file)}" if !Gemspec.published? gemspec_file
+					}
+				end
+			end
+		end
+	end
+end

data/lib/push.rb

@@ -1,9 +1,9 @@
-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
+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,25 +1,25 @@
-#
-# 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
+#
+# 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/text.rb

@@ -1,15 +1,15 @@
-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
-
+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/timeout.rb

@@ -1,54 +1,58 @@
-############################################################################
-# The following code is based on code originally copied from 
-# https://gist.github.com/lpar/1032297
-# Gist title: lpar/timeout.rb
-############################################################################
-# Runs a specified shell command in a separate thread.
-# If it exceeds the given timeout in seconds, kills it.
-# Returns any output produced by the command (stdout or stderr) as a String.
-# Uses Kernel.select to wait up to the tick length (in seconds) between 
-# checks on the command's status
-#
-# If you've got a cleaner way of doing this, I'd be interested to see it.
-# If you think you can do it with Ruby's Timeout module, think again.
-def run_with_timeout(directory,command, timeout, tick)
-  output = ''
-  exit_code=1
-  begin
-    # Start task in another thread, which spawns a process
-    stdin, stderrout, thread = Open3.popen2e(command, :chdir=>directory)
-    # Get the pid of the spawned process
-    pid = thread[:pid]
-    start = Time.now
-
-    while (Time.now - start) < timeout and thread.alive?
-      # Wait up to `tick` seconds for output/error data
-      Kernel.select([stderrout], nil, nil, tick)
-      # Try to read the data
-      begin
-        output << stderrout.read_nonblock(BUFFER_SIZE)
-      rescue IO::WaitReadable
-        # A read would block, so loop around for another select
-      rescue EOFError
-        # Command has completed, not really an error...
-        break
-      end
-    end
-
-    # Give Ruby time to clean up the other thread
-    sleep 1
-
-    if thread.alive?
-      # We need to kill the process, because killing the thread leaves
-      # the process alive but detached, annoyingly enough.
-      Process.kill("TERM", pid)
-    else
-      exit_code=thread.value
-    end
-
-      ensure
-    stdin.close if stdin
-    stderrout.close if stderrout
-  end
-  return [output,exit_code]
+############################################################################
+# The following code is based on code originally copied from 
+# https://gist.github.com/lpar/1032297
+# Gist title: lpar/timeout.rb
+############################################################################
+# Runs a specified shell command in a separate thread.
+# If it exceeds the given timeout in seconds, kills it.
+# Returns any output produced by the command (stdout or stderr) as a String.
+# Uses Kernel.select to wait up to the tick length (in seconds) between 
+# checks on the command's status
+#
+# If you've got a cleaner way of doing this, I'd be interested to see it.
+# If you think you can do it with Ruby's Timeout module, think again.
+<<<<<<< HEAD
+def run_with_timeout(directory, command, timeout, tick)
+=======
+def run_with_timeout(directory,command, timeout, tick)
+>>>>>>> 64a620397b11df71b841ad38df0941319776318a
+  output = ''
+  exit_code=1
+  begin
+    # Start task in another thread, which spawns a process
+    stdin, stderrout, thread = Open3.popen2e(command, :chdir=>directory)
+    # Get the pid of the spawned process
+    pid = thread[:pid]
+    start = Time.now
+
+    while (Time.now - start) < timeout and thread.alive?
+      # Wait up to `tick` seconds for output/error data
+      Kernel.select([stderrout], nil, nil, tick)
+      # Try to read the data
+      begin
+        output << stderrout.read_nonblock(BUFFER_SIZE)
+      rescue IO::WaitReadable
+        # A read would block, so loop around for another select
+      rescue EOFError
+        # Command has completed, not really an error...
+        break
+      end
+    end
+
+    # Give Ruby time to clean up the other thread
+    sleep 1
+
+    if thread.alive?
+      # We need to kill the process, because killing the thread leaves
+      # the process alive but detached, annoyingly enough.
+      Process.kill("TERM", pid)
+    else
+      exit_code=thread.value
+    end
+
+      ensure
+    stdin.close if stdin
+    stderrout.close if stderrout
+  end
+  return [output,exit_code]
 end