dev 2.1.70 → 2.1.71

data/lib/apps/svn.rb

@@ -1,152 +1,152 @@
-require 'fileutils'
-require 'tmpdir'
-require_relative('../base/dir.rb')
-class Svn
-
-	def self.latest_revision
-	    if(Dir.exists?(".svn"))
-	      `svn update`
-		  `svn info`.scan(/Last Changed Rev: ([\d]+)/).each{|m|
-		    return m.first.to_s
-		  }
-		end
-		"0"
-	end
-
-	def self.url
-		if(Dir.exists?(".svn"))
-		  `svn info`.scan(/URL: ([:\/\.\-\d\w]+)/).each{|m|
-		    return m.first.to_s
-		  }
-		end
-		''
-	end
-
-	def self.export url, destination
-		if(!File.exists?(destination.chomp('@')))
-			`svn export #{url} #{destination}`
-		end
-	end
-
-	def self.has_changes? directory=''
-        directory=Dir.pwd if directory.length==0
-        Dir.chdir(directory) do
-            if(File.exists?('.svn'))
-                return true if `svn status`.scan(/^[MA]/).length>0
-            end
-        end
-        false
-    end
-
-    def self.add source, directory=''
-    	directory=Dir.pwd if directory.length < 1
-    	Dir.chdir(directory) do
-	      	source.each{|f|
-				puts `svn add #{f} --parents` if `svn status #{f}`.include?('?')
-				puts `svn add #{f} --parents` if !system("svn status #{f}")
-			}
-		end
-    end
-
-    def self.append_commit_message message,directory=''
-    	directory=Dir.pwd if directory.length < 1
-    	Dir.chdir(directory) do
-    		
-    	end
-    end
-
-    def self.commit message, directory=''
-    	directory=Dir.pwd if directory.length < 1
-    	Dir.chdir(directory) do
-    		# svn commit -F commit_message_filename
-    		puts `svn commit -m"commit all"`
-    		`svn update`
-    	end
-    end
-
-	# publish a directory to a new subversion path
-	# source_dir is the directory with the files to be published
-	# destination is the new subversion path URL
-	# source_glob is a string or array of glob directives to specify files in source_dir to be publish
-	# source_glob defaults to '**/*' to publish all files in the source_dir
-	def self.publish destination, source_dir, source_filelist=FileList.new('**/*')
-
-		# Support for legacy argument order
-		if(source_dir.include?('svn:') || source_dir.include?('http:') || source_dir.include?('https:'))
-			puts 'warning arguments are in legacy order' if Environment.default.debug?
-			# swap arguments
-			tmp=source_dir
-			source_dir=destination
-			destination=tmp
-		end
-
-		if(!source_filelist.kind_of?(FileList))
-			puts 'converting files array into FileList' if Environment.default.debug?
-			list=FileList.new
-			source_filelist.each{|item|list.include(item)}
-			source_fileList=list
-		end
-
-		output = "\n"
-		if(`svn info #{destination} 2>&1`.include?('Revision:'))
-			puts "Svn.publish: destination #{destination} already exists" 
-		else
-			# create subversion directory
-			output = output + "svn mkdir #{destination} --parents --message mkdir_for_publishing"
-			if(!`svn mkdir #{destination} --parents --message mkdir_for_publishing`.include?('Committed'))
-				raise "failure 'svn mkdir #{destination} --parents --message mkdir_for_publishing'"
-			end
-
-			Dir.chdir(source_dir) do
-				files = source_filelist.to_a
-			end
-			files=source_filelist
-			output = output + "\nfiles: "
-			files.each{|f|
-				output = output + f + " "
-			}
-			pwd=Dir.pwd
-
-			dir="#{Environment.default.tmp_dir}/svn_publish"
-			Dir.remove dir if File.exists? dir
-			FileUtils.mkdir dir
-			Dir.chdir(dir) do
-			#Dir.mktmpdir{|dir|
-
-				# checkout new subversion directory
-				output = output + "\nsvn checkout #{destination} #{dir}/to_publish_checkout"
-				if(!`svn checkout #{destination} #{dir}/to_publish_checkout`.include?('Checked out'))
-					raise "failure 'svn checkout #{destination} #{dir}/to_publish_checkout'"
-				end
-
-				# copy files into the checkout out subversion directory to_publish
-				raise "#{dir}/to_publish_checkout does not exist" if(!File.exists?("#{dir}/to_publish_checkout"))
-				Dir.chdir("#{dir}/to_publish_checkout") do
-					File.open('add.txt','w'){|add_file|
-
-						files.each{|f|
-							fdir=File.dirname(f)
-							FileUtils.mkdir_p(fdir) if(fdir.length > 0 && !File.exists?(fdir))
-							FileUtils.cp("#{source_dir}/#{f}","#{f}")
-							add_file.puts f
-						}
-						add_file.close
-					}
-
-					output = output + "\nsvn add --parents --targets add.txt 2>&1"
-	                `svn add --parents --targets add.txt 2>&1`
-					commit_output = `svn commit -m"add" 2>&1`
-					output = output + "\n#{commit_output}"
-					if(!commit_output.include?("Committed"))
-						raise "failure 'svn commit -m'added files''" + output
-					end
-				end
-				
-				#begin
-				#Dir.remove "#{dir}/to_publish_checkout"
-				output
-			end
-			Dir.remove(dir)
-		end
-	end
+require 'fileutils'
+require 'tmpdir'
+require_relative('../base/dir.rb')
+class Svn
+
+	def self.latest_revision
+	    if(Dir.exists?(".svn"))
+	      `svn update`
+		  `svn info`.scan(/Last Changed Rev: ([\d]+)/).each{|m|
+		    return m.first.to_s
+		  }
+		end
+		"0"
+	end
+
+	def self.url
+		if(Dir.exists?(".svn"))
+		  `svn info`.scan(/URL: ([:\/\.\-\d\w]+)/).each{|m|
+		    return m.first.to_s
+		  }
+		end
+		''
+	end
+
+	def self.export url, destination
+		if(!File.exists?(destination.chomp('@')))
+			`svn export #{url} #{destination}`
+		end
+	end
+
+	def self.has_changes? directory=''
+        directory=Dir.pwd if directory.length==0
+        Dir.chdir(directory) do
+            if(File.exists?('.svn'))
+                return true if `svn status`.scan(/^[MA]/).length>0
+            end
+        end
+        false
+    end
+
+    def self.add source, directory=''
+    	directory=Dir.pwd if directory.length < 1
+    	Dir.chdir(directory) do
+	      	source.each{|f|
+				puts `svn add #{f} --parents` if `svn status #{f}`.include?('?')
+				puts `svn add #{f} --parents` if !system("svn status #{f}")
+			}
+		end
+    end
+
+    def self.append_commit_message message,directory=''
+    	directory=Dir.pwd if directory.length < 1
+    	Dir.chdir(directory) do
+    		
+    	end
+    end
+
+    def self.commit message, directory=''
+    	directory=Dir.pwd if directory.length < 1
+    	Dir.chdir(directory) do
+    		# svn commit -F commit_message_filename
+    		puts `svn commit -m"commit all"`
+    		`svn update`
+    	end
+    end
+
+	# publish a directory to a new subversion path
+	# source_dir is the directory with the files to be published
+	# destination is the new subversion path URL
+	# source_glob is a string or array of glob directives to specify files in source_dir to be publish
+	# source_glob defaults to '**/*' to publish all files in the source_dir
+	def self.publish destination, source_dir, source_filelist=FileList.new('**/*')
+
+		# Support for legacy argument order
+		if(source_dir.include?('svn:') || source_dir.include?('http:') || source_dir.include?('https:'))
+			puts 'warning arguments are in legacy order' if Environment.default.debug?
+			# swap arguments
+			tmp=source_dir
+			source_dir=destination
+			destination=tmp
+		end
+
+		if(!source_filelist.kind_of?(FileList))
+			puts 'converting files array into FileList' if Environment.default.debug?
+			list=FileList.new
+			source_filelist.each{|item|list.include(item)}
+			source_fileList=list
+		end
+
+		output = "\n"
+		if(`svn info #{destination} 2>&1`.include?('Revision:'))
+			puts "Svn.publish: destination #{destination} already exists" 
+		else
+			# create subversion directory
+			output = output + "svn mkdir #{destination} --parents --message mkdir_for_publishing"
+			if(!`svn mkdir #{destination} --parents --message mkdir_for_publishing`.include?('Committed'))
+				raise "failure 'svn mkdir #{destination} --parents --message mkdir_for_publishing'"
+			end
+
+			Dir.chdir(source_dir) do
+				files = source_filelist.to_a
+			end
+			files=source_filelist
+			output = output + "\nfiles: "
+			files.each{|f|
+				output = output + f + " "
+			}
+			pwd=Dir.pwd
+
+			dir="#{Environment.default.tmp_dir}/svn_publish"
+			Dir.remove dir if File.exists? dir
+			FileUtils.mkdir dir
+			Dir.chdir(dir) do
+			#Dir.mktmpdir{|dir|
+
+				# checkout new subversion directory
+				output = output + "\nsvn checkout #{destination} #{dir}/to_publish_checkout"
+				if(!`svn checkout #{destination} #{dir}/to_publish_checkout`.include?('Checked out'))
+					raise "failure 'svn checkout #{destination} #{dir}/to_publish_checkout'"
+				end
+
+				# copy files into the checkout out subversion directory to_publish
+				raise "#{dir}/to_publish_checkout does not exist" if(!File.exists?("#{dir}/to_publish_checkout"))
+				Dir.chdir("#{dir}/to_publish_checkout") do
+					File.open('add.txt','w'){|add_file|
+
+						files.each{|f|
+							fdir=File.dirname(f)
+							FileUtils.mkdir_p(fdir) if(fdir.length > 0 && !File.exists?(fdir))
+							FileUtils.cp("#{source_dir}/#{f}","#{f}")
+							add_file.puts f
+						}
+						add_file.close
+					}
+
+					output = output + "\nsvn add --parents --targets add.txt 2>&1"
+	                `svn add --parents --targets add.txt 2>&1`
+					commit_output = `svn commit -m"add" 2>&1`
+					output = output + "\n#{commit_output}"
+					if(!commit_output.include?("Committed"))
+						raise "failure 'svn commit -m'added files''" + output
+					end
+				end
+				
+				#begin
+				#Dir.remove "#{dir}/to_publish_checkout"
+				output
+			end
+			Dir.remove(dir)
+		end
+	end
 end

data/lib/apps/xcodebuild.rb

@@ -1,16 +1,16 @@
-#COMMANDS[:build]=['xcodebuild clean -scheme Hydrogen -destination "name=iPhone 6"',
-#                    'xcodebuild build -scheme Hydrogen -destination "name=iPhone 6"']
-#  COMMANDS[:test]=['xcodebuild test -scheme Hydrogen -destination "name=iPhone 6"'] if RUBY_PLATFORM.include?('darwin')
-
-class XCodeBuild < Hash
-	def self.get_build_commands xcodeproj_filename
-        #build_commands=Array.new 
-        #build_command=Command.new('xcodebuild build')
-        #build_command[:directory] = File.dirname(xcodeproj_filename)
-
-        #name=xcodeproj_filename.gsub('.xcodeproj','')
-        #build_commands << "xcodebuild clean -scheme #{name} -destination \"name=iPhone 6\""
-        #build_commands << "xcodebuild build -scheme #{name} -destination \"name=iPhone 6\""  
-        #build_commands << build_command
-    end
+#COMMANDS[:build]=['xcodebuild clean -scheme Hydrogen -destination "name=iPhone 6"',
+#                    'xcodebuild build -scheme Hydrogen -destination "name=iPhone 6"']
+#  COMMANDS[:test]=['xcodebuild test -scheme Hydrogen -destination "name=iPhone 6"'] if RUBY_PLATFORM.include?('darwin')
+
+class XCodeBuild < Hash
+	def self.get_build_commands xcodeproj_filename
+        #build_commands=Array.new 
+        #build_command=Command.new('xcodebuild build')
+        #build_command[:directory] = File.dirname(xcodeproj_filename)
+
+        #name=xcodeproj_filename.gsub('.xcodeproj','')
+        #build_commands << "xcodebuild clean -scheme #{name} -destination \"name=iPhone 6\""
+        #build_commands << "xcodebuild build -scheme #{name} -destination \"name=iPhone 6\""  
+        #build_commands << build_command
+    end
 end

data/lib/apps.rb

@@ -1,3 +1,3 @@
-puts __FILE__ if defined?(DEBUG)
-
+puts __FILE__ if defined?(DEBUG)
+
 ['git','msbuild','nuget','svn','wix','xcodebuild'].each{|name| require_relative("apps/#{name}.rb")}

data/lib/base/dir.rb

@@ -1,99 +1,99 @@
-require 'fileutils'
-
-class Dir
-  def self.make directory
-  	FileUtils.mkdir_p directory if !File.exists? directory
-  end
-  def self.remove directory, remove_empty_parents=false
-    begin
-      FileUtils.rm_rf directory if(!Dir.empty?(directory))
-      FileUtils.rm_r directory  if(File.exists?(directory))
-      if(remove_empty_parents)
-        parent_dir=File.dirname(directory)
-        Dir.remove parent_dir, true if(Dir.empty?(parent_dir))
-      end
-    rescue
-    end
-  end
-  def self.empty? directory
-    if((Dir.entries(directory) - %w{ . .. }).empty?)
-      return true
-    end
-    false
-  end
-
-  def self.get_latest_mtime directory
-    mtime=Time.new(1980)
-    Dir.chdir(directory)  do
-      latest_filename=''
-      Dir.glob('**/*.*').each{|f|
-        if mtime.nil? || File.mtime(f) > mtime
-          mtime=File.mtime(f) 
-          latest_filename=f
-        end
-      }
-      puts "   latest_mtime #{mtime.to_s} #{latest_filename}" if Environment.default.debug?
-    end
-    mtime
-  end
-
-  def self.zip(directory,files,zipfilename)
-    if Gem::Specification::find_all_by_name('rubyzip').any?
-      require 'zip'
-      File.delete(zipfilename) if(File.exists?(zipfilename))
-      Zip::File.open(zipfilename,Zip::File::CREATE) do |zipfile|
-        Dir.chdir(directory) do
-          count = 0
-          files.each{|source_file|
-            zipfile.add(source_file,"#{directory}/#{source_file}")
-            count = count + 1
-          }
-          puts "added #{count} files to #{zipfilename}"
-        end
-      end
-    else
-      puts "rubyzip gem is not installed 'gem install rubyzip'"
-    end
-end
-
-def self.unzip(zipfilename,directory)
-  if Gem::Specification::find_all_by_name('rubyzip').any?
-    require 'zip'
-    count = 0
-    Zip::File.open(zipfilename) do |zip_file|
-      zip_file.each do |entry|
-        dest = "#{directory}/#{entry.to_s}"
-        parent_dir=File.dirname(dest)
-        FileUtils.mkdir_p parent_dir if(!Dir.exists?(parent_dir))
-        entry.extract("#{directory}/#{entry.to_s}")
-        count = count + 1
-      end
-    end
-    puts "extracted #{count} files to #{directory}"
-  else
-    puts "rubyzip gem is not installed 'gem install rubyzip'"
-  end
-end
-
-def self.copy_files(src_dir,glob_pattern,exclude_patterns,target_dir)
-	if(Dir.exists?(src_dir))
-		Dir.chdir(src_dir) do
-			Dir.glob(glob_pattern).each{|f|
-        if(File.file?(f))
-          exclude = false
-          if(!exclude_patterns.nil?)
-            exclude_patterns.each{|p|
-              exclude = true if(f.include?(p))
-            }
-          end
-          if(!exclude)
-            dest = "#{target_dir}/#{f}"
-            FileUtils.mkdir_p(File.dirname(dest)) if(!Dir.exists?(File.dirname(dest)))
-            FileUtils.cp(f,dest)
-          end
-        end
-      }
-		end
-	end
-end
+require 'fileutils'
+
+class Dir
+  def self.make directory
+  	FileUtils.mkdir_p directory if !File.exists? directory
+  end
+  def self.remove directory, remove_empty_parents=false
+    begin
+      FileUtils.rm_rf directory if(!Dir.empty?(directory))
+      FileUtils.rm_r directory  if(File.exists?(directory))
+      if(remove_empty_parents)
+        parent_dir=File.dirname(directory)
+        Dir.remove parent_dir, true if(Dir.empty?(parent_dir))
+      end
+    rescue
+    end
+  end
+  def self.empty? directory
+    if((Dir.entries(directory) - %w{ . .. }).empty?)
+      return true
+    end
+    false
+  end
+
+  def self.get_latest_mtime directory
+    mtime=Time.new(1980)
+    Dir.chdir(directory)  do
+      latest_filename=''
+      Dir.glob('**/*.*').each{|f|
+        if mtime.nil? || File.mtime(f) > mtime
+          mtime=File.mtime(f) 
+          latest_filename=f
+        end
+      }
+      puts "   latest_mtime #{mtime.to_s} #{latest_filename}" if Environment.default.debug?
+    end
+    mtime
+  end
+
+  def self.zip(directory,files,zipfilename)
+    if Gem::Specification::find_all_by_name('rubyzip').any?
+      require 'zip'
+      File.delete(zipfilename) if(File.exists?(zipfilename))
+      Zip::File.open(zipfilename,Zip::File::CREATE) do |zipfile|
+        Dir.chdir(directory) do
+          count = 0
+          files.each{|source_file|
+            zipfile.add(source_file,"#{directory}/#{source_file}")
+            count = count + 1
+          }
+          puts "added #{count} files to #{zipfilename}"
+        end
+      end
+    else
+      puts "rubyzip gem is not installed 'gem install rubyzip'"
+    end
+end
+
+def self.unzip(zipfilename,directory)
+  if Gem::Specification::find_all_by_name('rubyzip').any?
+    require 'zip'
+    count = 0
+    Zip::File.open(zipfilename) do |zip_file|
+      zip_file.each do |entry|
+        dest = "#{directory}/#{entry.to_s}"
+        parent_dir=File.dirname(dest)
+        FileUtils.mkdir_p parent_dir if(!Dir.exists?(parent_dir))
+        entry.extract("#{directory}/#{entry.to_s}")
+        count = count + 1
+      end
+    end
+    puts "extracted #{count} files to #{directory}"
+  else
+    puts "rubyzip gem is not installed 'gem install rubyzip'"
+  end
+end
+
+def self.copy_files(src_dir,glob_pattern,exclude_patterns,target_dir)
+	if(Dir.exists?(src_dir))
+		Dir.chdir(src_dir) do
+			Dir.glob(glob_pattern).each{|f|
+        if(File.file?(f))
+          exclude = false
+          if(!exclude_patterns.nil?)
+            exclude_patterns.each{|p|
+              exclude = true if(f.include?(p))
+            }
+          end
+          if(!exclude)
+            dest = "#{target_dir}/#{f}"
+            FileUtils.mkdir_p(File.dirname(dest)) if(!Dir.exists?(File.dirname(dest)))
+            FileUtils.cp(f,dest)
+          end
+        end
+      }
+		end
+	end
+end
 end

data/lib/base/file.rb

@@ -1,35 +1,35 @@
-puts __FILE__ if defined?(DEBUG)
-
-require 'fileutils'
-
-class File
-	def self.amalgamate filename,source
-		File.open(filename,'w'){|file|
-			source.each{|source_file|
-				file.puts IO.read(source_file)
-			}
-		}
-	end
-
-	def self.publish destination, source_dir, source_glob='**/*', overwrite_existing=false
-
-		output = "\n"
-		FileUtils.mkdir_p destination if !File.exists? destination
-
-		files=nil
-		Dir.chdir(source_dir) do
-			files=FileList.new(source_glob).to_a
-		end
-		output = output + "\nfiles: #{files}.to_s"
-
-		Dir.chdir(source_dir) do
-			files.each{|f|
-				file="#{destination}/#{f}"
-				dirname=File.dirname(file)
-				FileUtils.mkdir_p dirname if !File.exists? dirname
-				FileUtils.cp(f,file) if !File.exists? file || overwrite_existing
-			}
-		end
-		output
-	end
+puts __FILE__ if defined?(DEBUG)
+
+require 'fileutils'
+
+class File
+	def self.amalgamate filename,source
+		File.open(filename,'w'){|file|
+			source.each{|source_file|
+				file.puts IO.read(source_file)
+			}
+		}
+	end
+
+	def self.publish destination, source_dir, source_glob='**/*', overwrite_existing=false
+
+		output = "\n"
+		FileUtils.mkdir_p destination if !File.exists? destination
+
+		files=nil
+		Dir.chdir(source_dir) do
+			files=FileList.new(source_glob).to_a
+		end
+		output = output + "\nfiles: #{files}.to_s"
+
+		Dir.chdir(source_dir) do
+			files.each{|f|
+				file="#{destination}/#{f}"
+				dirname=File.dirname(file)
+				FileUtils.mkdir_p dirname if !File.exists? dirname
+				FileUtils.cp(f,file) if !File.exists? file || overwrite_existing
+			}
+		end
+		output
+	end
 end