dev 2.0.264 → 2.0.265

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61faa5fc525d37466d14fba52fc17ba73258e244
-  data.tar.gz: 8ec479770a6062d4192bcfc9c7a1ab09a63dd3d9
+  metadata.gz: 5eda9c2c8ceddb7243d918f0b8fd3adef7516187
+  data.tar.gz: 2d9b02777f21e21081c22cb266f8121ee637bc0d
 SHA512:
-  metadata.gz: aebda3e608d75142ffc08585d7f8420b682553fdf9db77cffa02c0528becf5477247f807fdfc55a9dcae875058946e7f8a8e56eecdaa1cbfde066352d1bf58c2
-  data.tar.gz: a9646d547ea0391ac8ebae56d88e0dd240bade413cca05393639ffa7bc4bd0f07f98d5a5b41ec70ea17f04f6649133ce043feaa49c64a176e306c6e901b71058
+  metadata.gz: 4cb90b58b6ccfc1414f1b3098d49e039fc508f53900131b3ce250b179bcd6bfe143197c48c75eeb63aaed9d4b6011f8cce1ef2e67f513e921581fc61891373e5
+  data.tar.gz: 7162f67d6d015a07cabc28aa4f77a6fe46538ec74cd339e8c863d32a262e19c4da1b7739aa357b06cf4a2d623a758ad8e195317799e900cbf883073d48e6bb0a

data/lib/apps/wix.rb

@@ -9,13 +9,17 @@ class Wix
       if(File.exists?(wxs_file))
             ext='msi'
             ext='exe' if(IO.read(wxs_file).include?('<Bundle'))
+            extensions=''
+            ['WixNetFxExtension','WixBalExtension','WixUtilExtension','WixUiExtension'].each{|e|
+                  extensions="#{extensions}-ext e "
+            }
       	build_commands=Array.new if build_commands.nil?
-      	build_commands << "candle #{wxs_file} -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
-
+      	build_commands << "candle #{wxs_file} #{extensions}"
+            
       	if(defined?(VERSION))
-      		build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -out #{File.basename(wxs_file,'.*')}-#{VERSION}.#{ext} -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
+      		build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -out #{File.basename(wxs_file,'.*')}-#{VERSION}.#{ext} #{extensions}"
       	else
-      		build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
+      		build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj #{extensions}"
       	end
       end
       build_commands

data/lib/base/dir.rb

@@ -0,0 +1,18 @@
+puts __FILE__ if defined?(DEBUG)
+
+require 'fileutils'
+
+class Dir
+  def self.make directory
+  	FileUtils.mkdir_p directory if !File.exists? directory
+  end
+  def self.remove directory
+    if(File.exists?(directory))
+      begin
+        FileUtils.rm_rf directory
+        FileUtils.rm_r directory
+      rescue
+      end
+    end
+  end
+end

data/lib/base/environment.rb

@@ -19,7 +19,7 @@ class Environment < Hash
     if(!value.nil?)
       FileUtils.mkdir_p value if(!File.exists?(value))
       ['bin','data','log','make','publish','test'].each{|dir|
-        FileUtils.mkdir_p("#{value}/#{dir}") if !File.exists? "#{value}/#{dir}"
+        #FileUtils.mkdir_p("#{value}/#{dir}") if !File.exists? "#{value}/#{dir}"
       }
     end
   end

data/lib/base/history.rb

@@ -0,0 +1,14 @@
+puts __FILE__ if defined?(DEBUG)
+
+class History
+	attr_accessor :dev
+
+	def initialize dev=nil
+		@dev=dev
+		@dev=Dev.new if @dev.nil?
+	end
+	
+	def get_work_command value
+		nil
+	end
+end

data/lib/base/project.rb

@@ -17,7 +17,7 @@ class Project < Hash
 	end
 
 	def self.get_fullname directory
-	    directory.gsub(Environment.dev_root,'').gsub('/trunk','') .gsub('/wrk','')
+	    directory.gsub(Environment.dev_root,'').gsub('/wrk','')
 	end
 
 	def self.get_fullname_from_url url
@@ -26,6 +26,7 @@ class Project < Hash
 
 	def initialize value=''
 		@filename=''
+
 		self[:url]=Project.get_url
 		self[:fullname]=Project.get_fullname_from_url self[:url] if self[:url].length > 0
 		if value.is_a?(String)

data/lib/base/projects.rb

@@ -8,10 +8,16 @@ require_relative('../apps/git.rb')
 require_relative('../apps/svn.rb')
 
 class Projects < Hash
-	attr_accessor :filename
+	attr_accessor :dev
 
-	def initialize
-		@filename=''
+	def initialize dev=nil
+		@dev=dev
+		@dev=Dev.new if @dev.nil?
+		open
+	end
+
+	def filename
+		"#{@dev.get_env('DEV_ROOT')}/data/Projects.json"
 	end
 
     def update_state
@@ -22,15 +28,17 @@ class Projects < Hash
     	}
     end
 
-	def save filename=''
-		@filename=filename if !filename.nil? && filename.length > 0
-		File.open(@filename,'w'){|f|f.write(JSON.pretty_generate(self))} if @filename.length > 0
+	def save
+		Dir.make File.dirname(filename) if !File.exists? File.dirname(filename)
+		File.open(filename,'w'){|f|f.write(JSON.pretty_generate(self))}
 	end
 
-	def open filename=''
-		@filename=filename if filename.length > 0
-		JSON.parse(IO.read(@filename)).each{|k,v| self[k]=v}
-		update_state
+	def open
+		if File.exists? filename
+		  #@filename=filename if filename.length > 0
+		  JSON.parse(IO.read(filename)).each{|k,v| self[k]=v}
+		  update_state
+	    end
 	end
 
     def list filter=''
@@ -121,7 +129,7 @@ class Projects < Hash
     	  if(project.fullname.length > 0 && !self.has_key?(project.fullname))
 		   	puts "adding #{project.fullname}"
 		   	self[project.fullname]=project
-		   	self.save Projects.user_projects_filename
+		   	self.save #Projects.user_projects_filename
 		  end
 		end
     end
@@ -149,8 +157,8 @@ class Projects < Hash
 	end
 end
 
-PROJECTS=Projects.new
-PROJECTS.open Projects.user_projects_filename if File.exists? Projects.user_projects_filename
+#PROJECTS=Projects.new
+#PROJECTS.open Projects.user_projects_filename if File.exists? Projects.user_projects_filename
 #current=Projects.current # this makes sure the current project is added to PROJECTS
 #PROJECTS[current.fullname]=current if(!current.nil? && !PROJECTS.has_key?(current.fullname) && current.wrk_dir == Rake.application.original_dir)
 #PROJECTS.save Projects.user_projects_filename if !File.exists? Projects.user_projects_filename

data/lib/base.rb

@@ -1,5 +1,5 @@
 puts __FILE__ if defined?(DEBUG)
 
-['array','command','environment','file','gemspec',
- 'hash','internet','project','projects','source',
+['array','command','dir','environment','file','gemspec',
+ 'hash','history','internet','project','projects','source',
  'string','text','timeout','timer','version'].each{|name| require_relative("base/#{name}.rb")}

data/lib/dev.rb

@@ -12,12 +12,43 @@ end
 PROJECT=Project.new()
 
 class Dev
+	attr_accessor :projects,:history
+
+	def initialize env=nil
+		@env=Hash.new
+		@env_aliases={'HOME' => ['USERPROFILE'],
+		          'DEV_ROOT' => ['DEV_HOME','HOME','USERPROFILE']
+		}
+		env.each{|k,v| @env[k.to_s]=v} if !env.nil?
+		@projects=Projects.new(self)
+		@history=History.new(self)
+	end
+
+	def reset
+		@projects=nil
+	end
+
+	def get_env key
+		if(!@env.nil? && @env.has_key?(key))
+		  return @env[key] 
+	    end
+		value = ENV[key]
+		if(value.nil?)
+			if(@env_aliases.has_key?(key))
+				@env_aliases[key].each{|akey|
+					value=get_env(akey) if value.nil?
+				}
+			end
+		end
+		value
+	end
+    
 	def execute args
 		if(args.kind_of?(String))
 			args=args.split(' ')
 		end
-		projects=Projects.new
-		projects.open Projects.user_projects_filename if File.exists? Projects.user_projects_filename
+		#projects=Projects.new
+		#projects.open Projects.user_projects_filename if File.exists? Projects.user_projects_filename
 		projects.add(args) if args.length > 0 && args[0] == 'add'
 		projects.import(args.length>1 ? args[1]:'') if args.length > 0 && args[0] == 'import'
 		projects.list(args.length>1 ? args[1]:'') if args.length > 0 && args[0] == 'list'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 2.0.264
+  version: 2.0.265
 platform: ruby
 authors:
 - Lou Parslow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -70,10 +70,12 @@ files:
 - lib/base.rb
 - lib/base/array.rb
 - lib/base/command.rb
+- lib/base/dir.rb
 - lib/base/environment.rb
 - lib/base/file.rb
 - lib/base/gemspec.rb
 - lib/base/hash.rb
+- lib/base/history.rb
 - lib/base/internet.rb
 - lib/base/project.rb
 - lib/base/projects.rb
@@ -122,8 +124,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: dev
 test_files: []
+has_rdoc: