dev_commands 0.0.17 → 0.0.18

data/lib/commands.rb

@@ -1,29 +1,34 @@
-require_relative('hash.rb')
-require_relative('setup.rb')
-require_relative('build.rb')
-require_relative('test.rb')
-require_relative('publish.rb')
-require_relative('doc.rb')
-require_relative('clean.rb')
-require_relative('clobber.rb')
-require_relative('add.rb')
-require_relative('commit.rb')
-require_relative('push.rb')
-
-class Commands < Hash
-
-	def initialize directory=Dir.pwd
-		Dir.chdir(directory) do
-		  self[:setup]=Setup.new
-		  self[:build]=Build.new
-		  self[:test]=Test.new
-		  self[:publish]=Publish.new
-		  self[:doc]=Doc.new
-		  self[:clean]=Clean.new
-		  self[:add]=Add.new
-		  self[:commit]=Commit.new
-		  self[:push]=Push.new
-	    end
-	end
-
+require_relative('hash.rb')
+require_relative('pull.rb')
+require_relative('update.rb')
+require_relative('setup.rb')
+require_relative('build.rb')
+require_relative('test.rb')
+require_relative('publish.rb')
+require_relative('doc.rb')
+require_relative('clean.rb')
+require_relative('clobber.rb')
+require_relative('add.rb')
+require_relative('commit.rb')
+require_relative('push.rb')
+
+class Commands < Hash
+
+	def initialize directory=Dir.pwd
+		Dir.chdir(directory) do
+		  self[:pull]=Pull.new
+		  self[:update]=Update.new
+		  self[:setup]=Setup.new
+		  self[:build]=Build.new
+		  self[:test]=Test.new
+		  self[:doc]=Doc.new
+		  self[:clean]=Clean.new
+		  self[:publish]=Publish.new
+		  self[:clobber]=Clobber.new
+		  self[:add]=Add.new
+		  self[:commit]=Commit.new
+		  self[:push]=Push.new
+	    end
+	end
+
 end

data/lib/commit.rb

@@ -1,15 +1,15 @@
-class Commit < Array
-	def update
-		if(File.exists?('.git') && `git config --list`.include?('user.name='))
-			if(!`git status`.include?('nothing to commit') &&
-			   !`git status`.include?('untracked files present'))
-			  if(File.exists?('commit.message') && File.read('commit.message').gsub(/\s+/,"").length >0)
-			  	add "git commit -a -v -m \"#{File.read('commit.message')}\""
-			  else
-			    add "git commit -m'all'"
-			  end
-			  add "<%FileUtils.rm('commit.message')%>" if File.exists?('commit.message')
-		    end 		
-		end
-	end
+class Commit < Array
+	def update
+		if(File.exists?('.git') && `git config --list`.include?('user.name='))
+			if(!`git status`.include?('nothing to commit') &&
+			   !`git status`.include?('untracked files present'))
+			  if(File.exists?('commit.message') && File.read('commit.message').gsub(/\s+/,"").length >0)
+			  	add "git commit -a -v -m \"#{File.read('commit.message')}\""
+			  else
+			    add "git commit -m'all'"
+			  end
+			  add "<%FileUtils.rm('commit.message')%>" if File.exists?('commit.message')
+		    end 		
+		end
+	end
 end

data/lib/dev_commands.rb

@@ -1,15 +1,21 @@
-require 'json'
-require 'rake/clean'
-
-#CLEAN.include('.yardoc','log','tmp','*.gem','obj')
-#CLEAN.include('**/*.{suo,sdf}')
-CLOBBER.include('bin','doc')
-
-
-require_relative('command.rb')
-require_relative('commands.rb')
-require_relative('text.rb')
-require_relative('gemspec.rb')
-require_relative('git.rb')
-
+require 'json'
+require 'rake/clean'
+
+#CLEAN.include('.yardoc','log','tmp','*.gem','obj')
+#CLEAN.include('**/*.{suo,sdf}')
+CLOBBER.include('bin','doc')
+
+SOURCE=FileList.new('LICENSE','README','README.md',"Gemfile")
+SOURCE.include('**/*.{gitignore,yml,gemspec,rb}')
+SOURCE.include('**/*.{cs}')
+SOURCE.include('**/*.{c,h}')
+SOURCE.include('**/*.{cpp,hpp}')
+
+
+require_relative('command.rb')
+require_relative('commands.rb')
+require_relative('text.rb')
+require_relative('gemspec.rb')
+require_relative('git.rb')
+
 COMMANDS=Commands.new

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,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 #{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/msbuild.rb

@@ -0,0 +1,27 @@
+class MSBuild
+	def self.get_vs_version(sln_filename)
+   		sln_text=File.read(sln_filename,:encoding=>'UTF-8')
+    	return :vs9 if sln_text.include?('Format Version 10.00')
+    	return :vs12
+  	end
+
+  	def self.get_configurations(sln_filename)
+    	configs=Array.new
+	  	sln_text=File.read(sln_filename,:encoding=>'UTF-8')
+    	sln_text.scan( /= ([\w]+)\|/ ).each{|m|
+	  	c=m.first.to_s
+	  	configs << c if !configs.include?(c)
+		}
+		return configs
+  	end
+
+  	def self.get_platforms(sln_filename)
+    	platforms=Array.new
+	  	sln_text=File.read(sln_filename,:encoding=>"UTF-8")
+    	sln_text.scan( /= [\w]+\|([\w ]+)/ ).each{|m|
+	    	p=m.first.to_s
+	    	platforms << p if !platforms.include?(p)
+	  	}
+		return platforms
+  	end
+end

data/lib/publish.rb

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

data/lib/pull.rb

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

data/lib/push.rb

@@ -1,8 +1,8 @@
-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
+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
 end

data/lib/setup.rb

@@ -1,9 +1,9 @@
-class Setup < Array
-	def update
-		add 'bundle install' if(File.exists?('Gemfile'))
-
-		Dir.glob('*.gemspec').each{|gemspec_file|
-			add "<%Gemspec.update('#{gemspec_file}')%>"
-		}
-	end
+class Setup < Array
+	def update
+		add 'bundle install' if(File.exists?('Gemfile'))
+
+		Dir.glob('*.gemspec').each{|gemspec_file|
+			add "<%Gemspec.update('#{gemspec_file}')%>"
+		}
+	end
 end

data/lib/test.rb

@@ -1,5 +1,5 @@
-class Test < Array
-	def update
-		add 'rspec' if File.exists?('spec')
-	end
+class Test < Array
+	def update
+		add 'rspec' if File.exists?('spec')
+	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_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
+
 end

data/lib/update.rb

@@ -0,0 +1,5 @@
+class Update < Array
+	def update
+		self .add 'svn update' if File.exists?('.svn')
+	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