dev 2.0.293 → 2.0.294

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cb48ef891c3c3b0f2701281e2d5ca76e4918a39
-  data.tar.gz: 5888ebaabd5111748cbc15bb9d441c9ff12f75f9
+  metadata.gz: 575919f6f3542da25bc7531c17edc2e205e5f167
+  data.tar.gz: e798408d0feb4e0fda6c001bd8149b05ccf5c5e2
 SHA512:
-  metadata.gz: 0f2f2e43b47f8e7fa631c0195e941efe2b7ff2f538bf20013a6e52e57d7fb7a0c700bae241da5e12d7f3a36da8b8a61de0a1243dba1ddf55656b58612244d6ec
-  data.tar.gz: cf78b9a0c8ab9b7dd72e1fb7995b1bcede0bd70b278846b2fbbc26cae9dfc9853a7af4c3b31066776f0ccb7e112ae67fcb4a830026cac3a4f4acc8c0f38cfe34
+  metadata.gz: eb1073ff9933775b434d07a3098cd833f4aef65addd70d93163c1229d737c75b6d334e39e03c9cc7da2cee2b187fea5c60eb03db52a544b10b031b3ee3d96fa8
+  data.tar.gz: 56bb5cf0e24b1ac2645c0b3f0c78c191c80ae6c5c219cc2e92ca08859f90e56cbca0d3b98e5611230614b415968ae9fbe216269b7f2f77914ce5074470ab0fbc

data/lib/base/environment.rb

@@ -3,7 +3,7 @@ puts __FILE__ if defined?(DEBUG)
 require_relative('string.rb')
 
 class Environment < Hash
-  attr_accessor :output,:publish_dir
+  attr_accessor :output
   @@default=nil
   def self.default
     @@default=Environment.new if @@default.nil?
@@ -12,7 +12,6 @@ class Environment < Hash
 
   def initialize env=nil
     @output=''
-
     @env=Hash.new
     @env_aliases={'HOME' => ['USERPROFILE'],
                   'DEV_ROOT' => ['DEV_HOME','HOME','USERPROFILE'],
@@ -20,9 +19,6 @@ class Environment < Hash
     }
     env.each{|k,v| @env[k.to_s]=v} if !env.nil?
     @@default=self if @@default.nil?
-
-    @publish_dir="#{root_dir}/publish"
-    FileUtils.mkdir_p @publish_dir if !File.exists? @publish_dir
   end
 
   #####Begin LEGACY support
@@ -57,11 +53,11 @@ class Environment < Hash
     dir
   end
 
-  #def publish_dir
-  #  dir="#{root_dir}/publish"
-  #  FileUtils.mkdir_p dir if !File.exists? dir
-  #  dir
-  #end
+  def publish_dir
+    dir="#{root_dir}/publish"
+    FileUtils.mkdir_p dir if !File.exists? dir
+    dir
+  end
 
   def wrk_dir
     dir="#{root_dir}/wrk"

data/lib/base/source.rb

@@ -9,7 +9,7 @@ SOURCE.include('**/*.{cpp,hpp}')
 SOURCE.include('**/*.{swift}')
 SOURCE.include('**/*.{xcodeproj,plist,storyboard,json}')
 SOURCE.include('**/*.{csproj,sln,nuspec,config,snk}')
-SOURCE.include('**/*.{jpeg}')
+SOURCE.include('**/*.{jpeg,jpg}')
 SOURCE.include('**/*.{wxs}')
 SOURCE.exclude('bin','obj','lib')
 SOURCE.exclude('**/obj/**/*.*')

data/lib/tasks/publish.rb

@@ -28,7 +28,7 @@ class Publish < Array
 
 		Dir.glob("#{Rake.application.original_dir}/**/*.{nupkg,msi,gem}").each{|publish_file|
 			dest="#{Environment.default.publish_dir}/#{File.basename(publish_file)}"
-			add_quiet "<%FileUtils.cp('#{publish_file}','#{dest}')%>" if(!File.exists?(dest) && !publish_file.include?('packages/'))
+			add_quiet "<%FileUtils.cp('#{publish_file}','#{dest}')%>" if(!File.exists?(dest) || dest.include?('0.0'))
 		}
 	end
 end

data/lib/tasks/push.rb

@@ -3,9 +3,11 @@ task :push do Tasks.execute_task :push;end
 
 class Push < Array
 	def update
-		if(File.exists?('.git') && `git config --list`.include?('user.name=') && `git branch`.include?('* master') )
-			add_quiet 'git push'
-			add_quiet 'git push --tags'
+		if(File.exists?('.git') && `git config --list`.include?('user.name='))
+		    if(`git branch`.include?('* master') || `git branch`.include?('* develop'))
+				add_quiet 'git push'
+				add_quiet 'git push --tags'
+			end
 		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 2.0.293
+  version: 2.0.294
 platform: ruby
 authors:
 - Lou Parslow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: dev