dev 2.1.153 → 2.1.154

data/lib/base/projects.rb

@@ -1,257 +1,242 @@
+# frozen_string_literal: true
+
 puts DELIMITER if defined?(DEBUG)
 puts __FILE__ if defined?(DEBUG)
 
-require 'json'
-require 'rake'
-require_relative('environment.rb')
-require_relative('project.rb')
-require_relative('../apps/git.rb')
-require_relative('../apps/svn.rb')
+require "json"
+require "rake"
+require_relative("environment")
+require_relative("project")
+require_relative("../apps/git")
+require_relative("../apps/svn")
 
 class Projects < Hash
-	attr_accessor :env
-
-	def initialize env=nil
-		@env=env if env.kind_of?(Environment)
-		@env=Environment.new if @env.nil?
-		open
-	end
-
-	def filename
-		"#{@env.root_dir}/data/Projects.json"
-	end
-
-    def current
-      fullname=Rake.application.original_dir.gsub("#{Environment.default.wrk_dir}/",'')
-      if(self.has_key? fullname)
-        self[fullname]
-      else
-      	project=nil
-      	begin
-    		project=Project.new(Project.get_url,fullname)
-    	rescue
-        	project=nil
-        end
-        project
+  attr_accessor :env
+
+  def initialize(env = nil)
+    @env = env if env.is_a?(Environment)
+    @env = Environment.new if @env.nil?
+    open
+  end
+
+  def filename
+    "#{@env.root_dir}/data/Projects.json"
+  end
+
+  def current
+    fullname = Rake.application.original_dir.gsub("#{Environment.default.wrk_dir}/", "")
+    if key? fullname
+      self[fullname]
+    else
+      project = nil
+      begin
+        project = Project.new(Project.get_url, fullname)
+      rescue StandardError
+        project = nil
       end
+      project
     end
-
-	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
-		if File.exists? filename
-		  JSON.parse(IO.read(filename)).each{|k,v|
-		  	if(v.kind_of?(Project))
-		  		self[k]=v
-		  	else
-		  		self[k]=Project.new(v)
-		  	end
-		}
-		  #update_state
-	    end
-	end
-
-    def get_projects value=''
-    	puts "get_projects #{value.to_s}" if @env.debug?
-    	puts "get_project total project count #{self.length}" if @env.debug?
-    	projects=Array.new
-    	filter=''
-    	filter=value.to_s if !value.nil? && value.kind_of?(String)
-    	filter=value[0].to_s if !value.nil? && value.kind_of?(Array) && !value[0].to_s.include?('=')
-
-        puts "get_project filter '#{filter}'" if @env.debug?
-    	self.each{|k,v|
-    		puts " checking project #{k}" if @env.debug?
-    		puts " v.class #{v.class}" if @env.debug?
-    		if(filter.length==0 || k.include?(filter))
-    			if(v.kind_of?(Project))
-    			   projects << v
-    			   v.env=@env
-    			end
-    		end
-    	}
-    	projects
+  end
+
+  def save
+    Dir.make File.dirname(filename) unless File.exist? File.dirname(filename)
+    File.open(filename, "w") { |f| f.write(JSON.pretty_generate(self)) }
+  end
+
+  def open
+    if File.exist? filename
+      JSON.parse(IO.read(filename)).each do |k, v|
+        self[k] = if v.is_a?(Project)
+            v
+          else
+            Project.new(v)
+          end
+      end
+      # update_state
     end
-
-    def add args
-    	url=args[0]
-    	project=Project.new(url)
-    	project[:fullname]=args[1] if args.length > 1
-    	project.set_timeout args[2] if args.length > 2
-    	if(!self.has_key?(project[:fullname]) && project[:fullname].length > 0)
-    		@env.out "adding #{project.fullname}\n"
-    		self[project.fullname]=project
-    		self.save
-    	end
+  end
+
+  def get_projects(value = "")
+    puts "get_projects #{value}" if @env.debug?
+    puts "get_project total project count #{length}" if @env.debug?
+    projects = []
+    filter = ""
+    filter = value.to_s if !value.nil? && value.is_a?(String)
+    filter = value[0].to_s if !value.nil? && value.is_a?(Array) && !value[0].to_s.include?("=")
+
+    puts "get_project filter '#{filter}'" if @env.debug?
+    each do |k, v|
+      puts " checking project #{k}" if @env.debug?
+      puts " v.class #{v.class}" if @env.debug?
+      if (filter.length.zero? || k.include?(filter)) && v.is_a?(Project)
+        projects << v
+        v.env = @env
+      end
     end
-
-    def remove args
-    	projects=get_projects args
-		puts "removing #{projects.length} projects..." if @env.debug?
-		remove_keys=[]
-    	projects.each{|project|
-    		project.clobber
-    		remove_keys << project.fullname
-    	}
-    	remove_keys.each{|key|self.delete(key)}
-    	self.save
-    	return 0
-	end
-
-    def help args
+    projects
+  end
+
+  def add(args)
+    url = args[0]
+    project = Project.new(url)
+    project[:fullname] = args[1] if args.length > 1
+    project.set_timeout args[2] if args.length > 2
+    if !key?(project[:fullname]) && project[:fullname].length.positive?
+      @env.out "adding #{project.fullname}\n"
+      self[project.fullname] = project
+      save
     end
-    
-    def work args
-    	projects=get_projects args
-		puts "working #{projects.length} projects..." if @env.debug?
-		exit_code=0
-    	projects.each{|project|
-    		begin
-    		    result=project.work
-    		    exit_code=result.exit_code if(result.exit_code!=0)
-    		rescue => error
-		    	puts "error raised during work #{project.fullname}"
-		    	puts "--------------------------------------------"
-		    	puts error
-		    	puts "--------------------------------------------"
-		    end
-    	}
-    	exit_code
-	end
-
-	def info args
-		projects=get_projects args
-		puts "collecting info for #{projects.length} projects..." if @env.debug?
-		exit_code=0
-    	projects.each{|project|
-    		begin
-    		    result=project.info
-    		    exit_code=result.exit_code if(result.exit_code!=0)
-    		rescue => error
-		    	puts "error raised during work #{project.fullname}"
-		    	puts "--------------------------------------------"
-		    	puts error
-		    	puts "--------------------------------------------"
-		    end
-    	}
-    	exit_code
-	end
-
-    def list args
-    	projects=get_projects args
-		puts "listing #{projects.length} projects..." if @env.debug?
-    	projects.each{|project|
-    		project.list
-    		
-    	}
-    	return 0
-	end
-
-	def make args
-		projects=get_projects args
-		puts "making #{projects.length} projects..." if @env.debug?
-		exit_code=0
-		projects.each{|project|
-			begin
-			    result=project.make
-			    exit_code=result.exit_code if(result.exit_code!=0)
-		    rescue => error
-		    	puts "error raised during make #{project.fullname}"
-		    	puts "--------------------------------------------"
-		    	puts error
-		    	puts "--------------------------------------------"
-		    end
-		}
-		exit_code
-	end
-
-	def clobber args
-		projects=get_projects args
-		puts "clobbering #{projects.length} projects..." if @env.debug?
-		projects.each{|project|
-			begin
-			    project.clobber
-			    #Dir.remove_empty @env.wrk_dir
-		    rescue => error
-		    	puts "error raised during clobber #{project.fullname}"
-		    	puts "--------------------------------------------"
-		    	puts error
-		    	puts "--------------------------------------------"
-		    end
-		}
+  end
+
+  def remove(args)
+    projects = get_projects args
+    puts "removing #{projects.length} projects..." if @env.debug?
+    remove_keys = []
+    projects.each do |project|
+      project.clobber
+      remove_keys << project.fullname
     end
-
-	def update args
-		projects=get_projects args
-		puts "updating #{projects.length} projects..." if @env.debug?
-		projects.each{|project|
-		    begin
-		    	puts "updating #{project.fullname}" if @env.debug?
-    		    result=project.update
-    		    exit_code=result.exit_code if(result.exit_code!=0)
-    		rescue => error
-		    	puts "error raised during update #{project.fullname}"
-		    	puts "--------------------------------------------"
-		    	puts error
-		    	puts "--------------------------------------------"
-		    end
-		}
-	end
-
-	def self.user_projects_filename
-		FileUtils.mkdir_p("#{Environment.dev_root}/data") if(!File.exists?("#{Environment.dev_root}/data"))
-		"#{Environment.dev_root}/data/PROJECTS.json"
-	end
-
-	def self.current
-		project=nil
-		url=Git.remote_origin
-		url=Svn.url if url.length==0
-		if(Rake.application.original_dir.include?('/wrk/') &&
-			   url.length > 0)
-			project=Project.new(url)
-			fullname=Rake.application.original_dir.gsub("#{Environment.dev_root}/wrk/",'')
-			project[:fullname] = name if(name.length>0 && !name.include?(Environment.dev_root))
-			if(defined?(PROJECTS))
-				PROJECTS[name]=project if(!PROJECTS.has_key?(name))
-				project.each{|k,v|PROJECTS[name][k]=v}
-				PROJECTS.save
-			else
-				project[:fullname]=name
-			end
-		end			
-		project
-	end
-
-	def pull
-		self.each{|k,v| v.pull if v.respond_to?("pull".to_sym)}
-	end
-	def rake
-		self.each{|k,v| v.rake if v.respond_to?("rake".to_sym)}
-	end
-
-	def import pattern=''
-		wrk=@env.wrk_dir
-		if File.exists?(wrk)
-		   Dir.chdir(wrk) do
-		   	    puts "scanning #{wrk} for imports..."
-		   		Dir.glob('**/rakefile.rb').each{|rakefile|
-		   			rakedir=File.dirname(rakefile)
-		   			url = Project.get_url rakedir
-		   			project = Project.new(Project.get_url(rakedir))
-		   			project[:fullname]=rakedir.gsub(@env.wrk_dir,'') if(project.fullname.include?(':'))
-		   			if(pattern.length==0 || project.fullname.include?(pattern))
-		   				if(project.fullname.length > 0 && !self.has_key?(project.fullname))
-		   				    puts "importing #{project.fullname}"
-		   				    self[project.fullname]=project
-		   			    end
-		   			end
-		   		}
-		   end
-		   self.save
-	    end
-	end
-end
+    remove_keys.each { |key| delete(key) }
+    save
+    0
+  end
+
+  def help(args); end
+
+  def work(args)
+    projects = get_projects args
+    puts "working #{projects.length} projects..." if @env.debug?
+    exit_code = 0
+    projects.each do |project|
+      result = project.work
+      exit_code = result.exit_code if result.exit_code != 0
+    rescue StandardError => e
+      puts "error raised during work #{project.fullname}"
+      puts "--------------------------------------------"
+      puts e
+      puts "--------------------------------------------"
+    end
+    exit_code
+  end
+
+  def info(args)
+    projects = get_projects args
+    puts "collecting info for #{projects.length} projects..." if @env.debug?
+    exit_code = 0
+    projects.each do |project|
+      result = project.info
+      exit_code = result.exit_code if result.exit_code != 0
+    rescue StandardError => e
+      puts "error raised during work #{project.fullname}"
+      puts "--------------------------------------------"
+      puts e
+      puts "--------------------------------------------"
+    end
+    exit_code
+  end
+
+  def list(args)
+    projects = get_projects args
+    puts "listing #{projects.length} projects..." if @env.debug?
+    projects.each(&:list)
+    0
+  end
+
+  def make(args)
+    projects = get_projects args
+    puts "making #{projects.length} projects..." if @env.debug?
+    exit_code = 0
+    projects.each do |project|
+      result = project.make
+      exit_code = result.exit_code if result.exit_code != 0
+    rescue StandardError => e
+      puts "error raised during make #{project.fullname}"
+      puts "--------------------------------------------"
+      puts e
+      puts "--------------------------------------------"
+    end
+    exit_code
+  end
+
+  def clobber(args)
+    projects = get_projects args
+    puts "clobbering #{projects.length} projects..." if @env.debug?
+    projects.each do |project|
+      project.clobber
+      # Dir.remove_empty @env.wrk_dir
+    rescue StandardError => e
+      puts "error raised during clobber #{project.fullname}"
+      puts "--------------------------------------------"
+      puts e
+      puts "--------------------------------------------"
+    end
+  end
+
+  def update(args)
+    projects = get_projects args
+    puts "updating #{projects.length} projects..." if @env.debug?
+    projects.each do |project|
+      puts "updating #{project.fullname}" if @env.debug?
+      result = project.update
+      exit_code = result.exit_code if result.exit_code != 0
+    rescue StandardError => e
+      puts "error raised during update #{project.fullname}"
+      puts "--------------------------------------------"
+      puts e
+      puts "--------------------------------------------"
+    end
+  end
+
+  def self.user_projects_filename
+    FileUtils.mkdir_p("#{Environment.dev_root}/data") unless File.exist?("#{Environment.dev_root}/data")
+    "#{Environment.dev_root}/data/PROJECTS.json"
+  end
+
+  def self.current
+    project = nil
+    url = Git.remote_origin
+    url = Svn.url if url.length.zero?
+    if Rake.application.original_dir.include?("/wrk/") &&
+       url.length.positive?
+      project = Project.new(url)
+      fullname = Rake.application.original_dir.gsub("#{Environment.dev_root}/wrk/", "")
+      project[:fullname] = name if name.length.positive? && !name.include?(Environment.dev_root)
+      if defined?(PROJECTS)
+        PROJECTS[name] = project unless PROJECTS.key?(name)
+        project.each { |k, v| PROJECTS[name][k] = v }
+        PROJECTS.save
+      else
+        project[:fullname] = name
+      end
+    end
+    project
+  end
+
+  def pull
+    each { |_k, v| v.pull if v.respond_to?("pull".to_sym) }
+  end
+
+  def rake
+    each { |_k, v| v.rake if v.respond_to?("rake".to_sym) }
+  end
+
+  def import(pattern = "")
+    wrk = @env.wrk_dir
+    if File.exist?(wrk)
+      Dir.chdir(wrk) do
+        puts "scanning #{wrk} for imports..."
+        Dir.glob("**/rakefile.rb").each do |rakefile|
+          rakedir = File.dirname(rakefile)
+          url = Project.get_url rakedir
+          project = Project.new(Project.get_url(rakedir))
+          project[:fullname] = rakedir.gsub(@env.wrk_dir, "") if project.fullname.include?(":")
+          if (pattern.length.zero? || project.fullname.include?(pattern)) && (project.fullname.length.positive? && !key?(project.fullname))
+            puts "importing #{project.fullname}"
+            self[project.fullname] = project
+          end
+        end
+      end
+      save
+    end
+  end
+end

data/lib/base/source.rb

@@ -1,22 +1,24 @@
+# frozen_string_literal: true
+
 puts __FILE__ if defined?(DEBUG)
 
-SOURCE=FileList.new('LICENSE','README','README.md',"Gemfile")
-SOURCE.include('*.{gitignore,yml,gemspec}')
-SOURCE.include('**/*.{rb}')
-SOURCE.include('**/*.{cs,xaml,resx,settings}')
-SOURCE.include('**/*.{c,h}')
-SOURCE.include('**/*.{cpp,hpp}')
-SOURCE.include('**/*.{swift}')
-SOURCE.include('**/*.{xcodeproj,plist,storyboard,json}')
-SOURCE.include('**/*.{csproj,sln,nuspec,config,snk}')
-SOURCE.include('**/*.{saproj}')
-SOURCE.include('**/*.{jpeg,jpg,png,bmp,gif,tif}')
-SOURCE.include('**/*.{html,htm}')
-SOURCE.include('**/*.{ico}')
-SOURCE.include('**/*.{txt}')
-SOURCE.include('**/*.{wxs,_wxs}')
-SOURCE.exclude('bin','obj','lib')
-SOURCE.exclude('**/obj/**/*.*')
-SOURCE.exclude('**/bin/**/*.*')
-SOURCE.exclude('commit.message')
-SOURCE.exclude('rakefile.default')
+SOURCE = FileList.new("LICENSE", "README", "README.md", "Gemfile")
+SOURCE.include("*.{gitignore,yml,gemspec}")
+SOURCE.include("**/*.{rb}")
+SOURCE.include("**/*.{cs,xaml,resx,settings}")
+SOURCE.include("**/*.{c,h}")
+SOURCE.include("**/*.{cpp,hpp}")
+SOURCE.include("**/*.{swift}")
+SOURCE.include("**/*.{xcodeproj,plist,storyboard,json}")
+SOURCE.include("**/*.{csproj,sln,nuspec,config,snk}")
+SOURCE.include("**/*.{saproj}")
+SOURCE.include("**/*.{jpeg,jpg,png,bmp,gif,tif}")
+SOURCE.include("**/*.{html,htm}")
+SOURCE.include("**/*.{ico}")
+SOURCE.include("**/*.{txt}")
+SOURCE.include("**/*.{wxs,_wxs}")
+SOURCE.exclude("bin", "obj", "lib")
+SOURCE.exclude("**/obj/**/*.*")
+SOURCE.exclude("**/bin/**/*.*")
+SOURCE.exclude("commit.message")
+SOURCE.exclude("rakefile.default")

data/lib/base/string.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 puts __FILE__ if defined?(DEBUG)
 
 class String
-	def fix(size,padstr=' ')
-		self[0...size].rjust(size,padstr)
-	end
-end
+  def fix(size, padstr = " ")
+    self[0...size].rjust(size, padstr)
+  end
+end

data/lib/base/text.rb

@@ -1,30 +1,32 @@
+# frozen_string_literal: true
+
 puts __FILE__ if defined?(DEBUG)
 
 class Text
-  def self.replace_in_glob(glob,search,replace)
-     Dir.glob(glob).each{ |f| replace_in_file(f,search,replace) }
+  def self.replace_in_glob(glob, search, replace)
+    Dir.glob(glob).each { |f| replace_in_file(f, search, replace) }
   end
-   
-  def self.replace_in_file(filename,search,replace)
+
+  def self.replace_in_file(filename, search, replace)
     text1 = IO.read(filename)
-    text2 = text1.gsub(search) { |str| str=replace }
-    unless text1==text2
-      File.open(filename,"w") { |f| f.puts text2 }
+    text2 = text1.gsub(search) { |_str| str = replace }
+    unless text1 == text2
+      File.open(filename, "w") { |f| f.puts text2 }
       return true
     end
     false
   end
 
- def self.copy_if_different(source,destination)
-    if(!File.exists?(destination))
+  def self.copy_if_different(source, destination)
+    if !File.exist?(destination)
       FileUtils.cp source, destination
     else
-      source_text=IO.read(source)
-      destination_text=IO.read(destination)
-      if(source_text != destination_text)
+      source_text = IO.read(source)
+      destination_text = IO.read(destination)
+      if source_text != destination_text
         FileUtils.rm destination
         FileUtils.cp source, destination
       end
     end
-   end
-end
+  end
+end