dev 2.0.61 → 2.0.62

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8ff484dde9d17451f5e8c340fe7c988caa2b10c3
+  data.tar.gz: 59161e94aa5b5c90c17cd5cf9a95c1fe956cf303
+SHA512:
+  metadata.gz: d1e1a847bd9ee9e6edf6c71d883e01beac537b67a1517864cd00b9fbfc8ea436164ccb86341081dc9edde0875112ad2f49145b3214b6d5dfaaafe31952faa243
+  data.tar.gz: 1bdaa551ed3add8af54755664178c57e4c5f57aed495bcb3f81f4877e0c6645132ab1e60a1241502e7ddb25fd6a6d9e3b1324fb4cad33ba3c257db46fb0d6f9f

data/lib/dev_commands.rb

@@ -820,12 +820,10 @@ class Pull < Array
 		end
 	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?
+			self <<  'git push --tags' if Git.branch != 'develop' && Internet.available?
 		end
 	end
 end

data/lib/dev_git.rb

@@ -39,13 +39,30 @@ class Git
         FileUtils.mkpath directory if !File.exists?(directory)
         if(!File.exists?("#{directory}/.git"))
             Dir.chdir(directory) do
-               `git init`
-               File.open('.gitignore','w'){|f|
-                   f.puts '### Mac ###'
-                   f.puts '*.DS_Store'
-               }
-               `git add .gitignore`
-               `git commit -m'added .gitignore'`
+               `git init --bare`
+               #File.open('.gitignore','w'){|f|
+               #    f.puts '### Mac ###'
+               #    f.puts '*.DS_Store'
+               #}
+               #{}`git add .gitignore`
+               #{}`git commit -m'added .gitignore'`
+            end
+        end
+    end
+
+    def self.tag directory,version
+        directory=Dir.pwd if directory.length == 0
+        Dir.chdir(directory) do
+            `git pull`
+            tags=`git tag`
+            if(!tags.include?(version))
+                puts 'tagging branch'
+                puts `git tag version -m'#{version}'`
+                puts 'committing'
+                puts `git commit -m'#{version}'`
+                puts 'pushing'
+                puts `git push --tags`
+                puts `git push`
             end
         end
     end

data/lib/dev_svn.rb

@@ -68,58 +68,61 @@ class Svn
 	# 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 source_dir, destination, source_glob='**/*'
+	def self.publish destination, source_dir, source_glob='**/*'
 
 		output = "\n"
-		raise "Svn.publish: destination #{destination} already exists" if(`svn info #{destination} 2>&1`.include?('Revision:'))
-
-		# 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
-
-		files=nil
-		Dir.chdir(source_dir) do
-			files=FileList.new(source_glob).to_a
-		end
-		output = output + "\nfiles: #{files}.to_s"
-
-		pwd=Dir.pwd
-		Dir.mktmpdir{|dir|
+		if(`svn info #{destination} 2>&1`.include?('Revision:'))
+			#raise "Svn.publish: destination #{destination} already exists" 
+			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
 
-			# 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'"
+			files=nil
+			Dir.chdir(source_dir) do
+				files=FileList.new(source_glob).to_a
 			end
+			output = output + "\nfiles: #{files}.to_s"
 
-			# 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|
+			pwd=Dir.pwd
+			Dir.mktmpdir{|dir|
 
-					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
+				# 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
 					}
-					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
+					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
-			end
-			
-			#begin
-			FileUtils.rm_r "#{dir}/to_publish_checkout"
-			output
-		}
+				
+				#begin
+				FileUtils.rm_r "#{dir}/to_publish_checkout"
+				output
+			}
+		end
 	end
 end

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 2.0.61
-  prerelease: 
+  version: 2.0.62
 platform: ruby
 authors:
 - Lou Parslow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 description: development tasks
@@ -45,27 +42,25 @@ files:
 homepage: http://rubygems.org/gems/dev
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.28
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: dev
 test_files: []
-has_rdoc: