dev 2.1.153 → 2.1.154

data/lib/base/gemspec.rb

@@ -1,51 +1,53 @@
+# frozen_string_literal: true
+
 puts __FILE__ if defined?(DEBUG)
-require_relative('command.rb')
+require_relative("command")
 
 class Gemspec
-	def self.update gemspec_file
-		Text.replace_in_file gemspec_file,
-                              /('\d{4}-\d{2}-\d{2}')/,
-                              "'#{Time.now.strftime('%Y-%m-%d')}'"
-	end
-
-	def self.gemfile gemspec_file
-		spec=Gem::Specification.load(gemspec_file)
-		return "#{spec.name}-#{spec.version}.gem" if !spec.nil?
-		return ""
-	end
-
-    def self.version gemspec_file
-    	spec=Gem::Specification.load(gemspec_file)
-		return spec.version.to_s
-    end
+  def self.update(gemspec_file)
+    Text.replace_in_file gemspec_file,
+                         /('\d{4}-\d{2}-\d{2}')/,
+                         "'#{Time.now.strftime("%Y-%m-%d")}'"
+  end
 
-    def self.latest_published_version gemname
-    	scan=`gem list -r #{gemname}`.scan(/^dev\s*\(([\d.]+)\)/)
-		if(!scan.nil?)
-			return scan[0][0] if(scan.length > 0 && !scan[0].nil? && scan[0].length > 0)
-		end
-		''
-    end
+  def self.gemfile(gemspec_file)
+    spec = Gem::Specification.load(gemspec_file)
+    return "#{spec.name}-#{spec.version}.gem" unless spec.nil?
+
+    ""
+  end
+
+  def self.version(gemspec_file)
+    spec = Gem::Specification.load(gemspec_file)
+    spec.version.to_s
+  end
 
-    def self.published_version gemspec_file
-  		published_version=''
-    	spec=Gem::Specification.load(gemspec_file)
-		begin
-		  published_version = latest_published_version spec.name# `gem list -r #{spec.name}`.scan(/\((\d+.\d+.\d+)\)/)[0][0]
-		rescue
-		  published_version=''
-		end
-		published_version
+  def self.latest_published_version(gemname)
+    scan = `gem list -r #{gemname}`.scan(/^dev\s*\(([\d.]+)\)/)
+    return scan[0][0] if !scan.nil? && (scan.length.positive? && !scan[0].nil? && scan[0].length.positive?)
+
+    ""
+  end
+
+  def self.published_version(gemspec_file)
+    published_version = ""
+    spec = Gem::Specification.load(gemspec_file)
+    begin
+      published_version = latest_published_version spec.name # `gem list -r #{spec.name}`.scan(/\((\d+.\d+.\d+)\)/)[0][0]
+    rescue StandardError
+      published_version = ""
     end
-	def self.published? gemspec_file
-		published_version(gemspec_file)==version(gemspec_file) ? true : false
-	end
-
-	def self.normalize gemspec_file
-		spec=Gem::Specification.load(gemspec_file)
-		File.open(gemspec_file,'w'){|f|f.write(spec.to_ruby)}
-	end
-
-	def self.upgrade gemspec_file
-	end
-end
+    published_version
+  end
+
+  def self.published?(gemspec_file)
+    published_version(gemspec_file) == version(gemspec_file)
+  end
+
+  def self.normalize(gemspec_file)
+    spec = Gem::Specification.load(gemspec_file)
+    File.open(gemspec_file, "w") { |f| f.write(spec.to_ruby) }
+  end
+
+  def self.upgrade(gemspec_file); end
+end

data/lib/base/giturl.rb

@@ -1,107 +1,105 @@
+# frozen_string_literal: true
+
 class GitUrl
+  def self.pull(url)
+    if url.is_a?(Array)
+      url.each { |u| GitUrl.pull u }
+    else
+      puts " "
+      work_dir = get_work_dir(url)
+      unless Dir.exist?(work_dir)
+        puts "git clone #{url} #{work_dir}"
+        puts `git clone #{url} #{work_dir}`
+      end
 
-    def self.pull url
-        if(url.kind_of?(Array))
-            url.each{|u| GitUrl.pull u}
-        else
-            puts ' '
-            work_dir = get_work_dir(url)
-            if(!Dir.exists?(work_dir))
-                puts "git clone #{url} #{work_dir}"
-                puts `git clone #{url} #{work_dir}`
-            end
-        
-            Dir.chdir(work_dir) do
-                puts "git pull (#{work_dir})"
-                puts `git pull`
-            end
-        end
+      Dir.chdir(work_dir) do
+        puts "git pull (#{work_dir})"
+        puts `git pull`
+      end
     end
+  end
 
-    def self.build url 
+  def self.build(url)
+    if url.is_a?(Array)
+      url.each { |u| GitUrl.build u }
+    else
+      GitUrl.pull url
+      puts "build #{url}"
+      work_dir = get_work_dir(url)
+      puts "work_dir #{work_dir}"
 
-        if(url.kind_of?(Array))
-            url.each{|u| GitUrl.build u}
-        else
-            GitUrl.pull url
-            puts "build #{url}"
-            work_dir = get_work_dir(url)
-            puts "work_dir #{work_dir}"
+      Dir.chdir(work_dir) do
+        puts "rake #{work_dir}"
+        puts `rake`
+        puts "rake clobber"
+        puts `rake clobber`
+      end
+    end
+  end
 
-            Dir.chdir(work_dir) do
-                puts "rake #{work_dir}"
-                puts `rake`
-                puts "rake clobber"
-                puts `rake clobber`
-            end
-        end
+  def self.update_build_repo(url)
+    local_dir = "#{Environment.dev_root}/build/#{get_relative_dir(url)}"
+    unless Dir.exist?(local_dir)
+      puts "git clone #{url} #{local_dir}"
+      puts `git clone #{url} #{local_dir}`
     end
+    stags = ""
+    Dir.chdir(local_dir) do
+      puts `git pull`
+    end
+  end
 
-    def self.update_build_repo url
-        local_dir = Environment.dev_root + "/build/" + get_relative_dir(url)
-        if(!Dir.exists?(local_dir))
-            puts "git clone #{url} #{local_dir}"
-            puts `git clone #{url} #{local_dir}`
-        end
-        stags=''
-        Dir.chdir(local_dir) do
-            puts `git pull` 
-        end
+  def self.build_tags(url)
+    if url.is_a?(Array)
+      url.each { |u| GitUrl.build_tags u }
+    else
+      puts "GitUrl.build_tags #{url}"
+      local_dir = "#{Environment.dev_root}/build/#{get_relative_dir(url)}"
+      unless Dir.exist?(local_dir)
+        puts "git clone #{url} #{local_dir}"
+        puts `git clone #{url} #{local_dir}`
+      end
+      stags = ""
+      Dir.chdir(local_dir) do
+        puts `git pull`
+        stags = `git tag`.gsub('\r', "")
+      end
+      tags = stags.split("\n").reverse
+      puts "tags: #{tags}"
+      tags.each do |tag|
+        build_tag url, tag.strip
+      end
     end
+  end
 
-    def self.build_tags url
+  def self.build_tag(url, tag)
+    build_dir = get_build_dir_tag(url, tag)
+    unless Dir.exist?(build_dir)
+      puts "git clone -b #{tag} --single-branch --depth 1 #{url} #{build_dir}"
+      puts `git clone -b #{tag} --single-branch --depth 1 #{url} #{build_dir}`
 
-        if(url.kind_of?(Array))
-            url.each{|u| GitUrl.build_tags u}
-        else
-            puts "GitUrl.build_tags #{url}"
-            local_dir = Environment.dev_root + "/build/" + get_relative_dir(url)
-            if(!Dir.exists?(local_dir))
-                puts "git clone #{url} #{local_dir}"
-                puts `git clone #{url} #{local_dir}`
-            end
-            stags=''
-            Dir.chdir(local_dir) do
-                puts `git pull`
-                stags = `git tag`.gsub('\r','')
-                
-            end
-            tags = stags.split("\n").reverse
-            puts "tags: #{tags}"
-            tags.each{|tag|
-                build_tag url, tag.strip
-            }
+      if Dir.exist?(build_dir)
+        Dir.chdir(build_dir) do
+          puts "rake #{build_dir}"
+          puts `rake`
         end
+      end
     end
+  end
 
-    def self.build_tag url, tag
-        build_dir = get_build_dir_tag(url,tag)
-        if(!Dir.exists?(build_dir))
-            puts "git clone -b #{tag} --single-branch --depth 1 #{url} #{build_dir}"
-            puts `git clone -b #{tag} --single-branch --depth 1 #{url} #{build_dir}`
+  def self.get_work_dir(url)
+    "#{Environment.dev_root}/work/#{get_relative_dir(url)}"
+  end
 
-            if(Dir.exists?(build_dir)) 
-                Dir.chdir(build_dir) do
-                    puts "rake #{build_dir}"
-                    puts `rake`
-                end
-            end
-        end
-    end
-    
-    def self.get_work_dir url
-        Environment.dev_root + "/work/" + get_relative_dir(url)
-    end
+  def self.get_build_dir(url)
+    "#{Environment.dev_root}/build/#{get_relative_dir(url)}"
+  end
 
-    def self.get_build_dir url
-        Environment.dev_root + "/build/" + get_relative_dir(url)
-    end
+  def self.get_build_dir_tag(url, tag)
+    "#{Environment.dev_root}/build/#{get_relative_dir(url)}-#{tag}"
+  end
 
-    def self.get_build_dir_tag url, tag
-        Environment.dev_root + "/build/" + get_relative_dir(url) + "-#{tag}"
-    end
-    
-    def self.get_relative_dir url 
-        url.gsub('http://','').gsub('https://','').gsub('.git','')
-    end
-end
+  def self.get_relative_dir(url)
+    url.gsub("http://", "").gsub("https://", "").gsub(".git", "")
+  end
+end

data/lib/base/hash.rb

@@ -1,21 +1,26 @@
+# frozen_string_literal: true
+
 puts __FILE__ if defined?(DEBUG)
 
 class Hash
-	def execute value=nil
-	  self.each{|k,v|
+  def execute(value = nil)
+    each do |k, v|
       v.update if v.respond_to?(:update)
-      if(v.is_a?(Array) && v.length==0)
-        self.delete k 
-      else
-	  	  v.execute(value) if v.respond_to?(:execute)
+      if v.is_a?(Array) && v.length.zero?
+        delete k
+      elsif v.respond_to?(:execute)
+        v.execute(value)
       end
-	  }
-    end
-	def to_html
-      [
-      	'<div>',
-        map { |k, v| ["<br/><div><strong>#{k}</strong>", v.respond_to?(:to_html) ? v.to_html : "<span>#{v}</span></div><br/>"] },
-        '</div>'
-      ].join
     end
-end
+  end
+
+  def to_html
+    [
+      "<div>",
+      map do |k, v|
+        ["<br/><div><strong>#{k}</strong>", v.respond_to?(:to_html) ? v.to_html : "<span>#{v}</span></div><br/>"]
+      end,
+      "</div>",
+    ].join
+  end
+end

data/lib/base/history.rb

@@ -1,39 +1,42 @@
+# frozen_string_literal: true
+
 puts __FILE__ if defined?(DEBUG)
 
 class History
-	attr_accessor :dev
+  attr_accessor :dev
+
+  def initialize(dev = nil)
+    @dev = dev
+    @dev = Dev.new if @dev.nil?
+  end
+
+  # .0. for 0 exit codes
+  # .X. for non 0 exit codes
+  # project name is contained in directory name
+  def get_commands(pattern)
+    commands = []
+    Dir.chdir(@dev.log_dir) do
+      Dir.glob("*#{pattern.gsub("/", "-")}*.*").each do |logfile|
+        commands << Command.new(JSON.parse(IO.read(logfile)))
+      end
+    end
+    commands
+  end
 
-	def initialize dev=nil
-		@dev=dev
-		@dev=Dev.new if @dev.nil?
-	end
-	
-	# .0. for 0 exit codes
-	# .X. for non 0 exit codes
-	# project name is contained in directory name
-	def get_commands pattern
-		commands=Array.new
-		Dir.chdir(@dev.log_dir) do
-			Dir.glob("*#{pattern.gsub('/','-')}*.*").each{|logfile|
-				commands << Command.new(JSON.parse(IO.read(logfile)))
-			}
-		end
-		commands
-	end
+  def add_command(command)
+    code = "0"
+    code = "X" if command[:exit_code] != 0
+    directory = command[:directory].gsub(@dev.root_dir, "").gsub("/", "-")
+    name = "#{command[:input]}.#{code}.#{directory}.json"
+    filename = "#{@dev.log_dir}/#{name}"
+    puts "add command #{filename}" if @dev.debug?
+    File.open(filename, "w") { |f| f.write(command.to_json) }
+  end
 
-	def add_command command
-		code="0"
-		code="X" if command[:exit_code] !=0
-		directory=command[:directory].gsub(@dev.root_dir,'').gsub('/','-')
-		name="#{command[:input]}.#{code}.#{directory}.json"
-		filename="#{@dev.log_dir}/#{name}"
-		puts "add command #{filename}" if @dev.debug?
-		File.open(filename,'w'){|f|f.write(command.to_json)}
-	end
+  def get_wrk_command(project_fullname)
+    commands = get_commands(project_fullname.to_s.gsub("/", "-"))
+    return commands[0] if commands.length.positive?
 
-	def get_wrk_command project_fullname
-		commands=get_commands("#{project_fullname}".gsub('/','-'))
-		return commands[0] if commands.length > 0
-		nil
-	end
-end
+    nil
+  end
+end

data/lib/base/internet.rb

@@ -1,25 +1,27 @@
+# frozen_string_literal: true
+
 puts __FILE__ if defined?(DEBUG)
 
-require 'open-uri'
-require 'timeout'
-class Internet
+require "open-uri"
+require "timeout"
 
-	@@available=true
+class Internet
+  @@available = true
 
-	def self.available?
-		return @@available if !@@available.nil?
+  def self.available?
+    return @@available unless @@available.nil?
 
-		begin
-			index=open('http://www.google.com').read 
-			if index.include?('<Title>Google')
-				@@available = true
-			else
-				puts "open('http://www.google.com') returned false"
-			end
-		rescue Exception => e
-			puts "open('http://www.google.com') raised an exception: #{e.to_s}"
-			@@available = false
-		end
-		@@available
-	end
-end
+    begin
+      index = open("http://www.google.com").read
+      if index.include?("<Title>Google")
+        @@available = true
+      else
+        puts "open('http://www.google.com') returned false"
+      end
+    rescue Exception => e
+      puts "open('http://www.google.com') raised an exception: #{e}"
+      @@available = false
+    end
+    @@available
+  end
+end