dev 2.1.153 → 2.1.154

data/lib/apps.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 puts __FILE__ if defined?(DEBUG)
 
-['git','msbuild','nuget','svn','wix','xcodebuild','zip'].each{|name| require_relative("apps/#{name}.rb")}
+%w[git msbuild nuget svn wix xcodebuild zip].each { |name| require_relative("apps/#{name}.rb") }

data/lib/base/array.rb

@@ -1,82 +1,84 @@
-require_relative('environment.rb')
+# frozen_string_literal: true
+
+require_relative("environment")
+
 class Array
-    attr_accessor :env
-    def initialize env=nil
-      @env=env
-      @env=Environment.new() if @env.nil? 
-      @env=Environmnet.new() if !@env.kind_of?(Environment)
-    end
+  attr_accessor :env
 
-    def execute value=nil
-      @env=Environment.new() if @env.nil? 
-      i=0
-      #puts "Array.execute length=#{self.length}" if defined?(DEBUG)
-      while i < self.length
+  def initialize(env = nil)
+    @env = env
+    @env = Environment.new if @env.nil?
+    @env = Environmnet.new unless @env.is_a?(Environment)
+  end
 
-        #puts self[i].to_s if defined?(DEBUG)
-        #puts "Array[#{i.to_s}]'=nil" if @env.debug? && self[i].nil?
-        #puts "Array[#{i.to_s}].class=#{self[i].class.to_s}" if @env.debug? && !self[i].nil?
-        #puts "Array[#{i.to_s}].to_s=#{self[i].to_s}" if @env.debug? && !self[i].nil?
-        self[i]=Command.new({ :input => self[i], :quiet => true }) if(self[i].is_a?(String))
-        self[i]=Command.new(self[i]) if(self[i].is_a?(Hash) && !self[i].is_a?(Command))
+  def execute(value = nil)
+    @env = Environment.new if @env.nil?
+    i = 0
+    # puts "Array.execute length=#{self.length}" if defined?(DEBUG)
+    while i < length
 
-        if(!value.nil? && value.is_a?(Hash))
-          value.each{|k,v|self[i][k]=v}
-        end
+      # puts self[i].to_s if defined?(DEBUG)
+      # puts "Array[#{i.to_s}]'=nil" if @env.debug? && self[i].nil?
+      # puts "Array[#{i.to_s}].class=#{self[i].class.to_s}" if @env.debug? && !self[i].nil?
+      # puts "Array[#{i.to_s}].to_s=#{self[i].to_s}" if @env.debug? && !self[i].nil?
+      self[i] = Command.new({ input: self[i], quiet: true }) if self[i].is_a?(String)
+      self[i] = Command.new(self[i]) if self[i].is_a?(Hash) && !self[i].is_a?(Command)
 
-        if(self[i].is_a?(Command))
-          self[i].execute
-          @env.out self[i].summary
-        end
+      value.each { |k, v| self[i][k] = v } if !value.nil? && value.is_a?(Hash)
 
-        i=i+1
+      if self[i].is_a?(Command)
+        self[i].execute
+        @env.out self[i].summary
       end
-    end
 
-    def add command
-      self << command if !has_command? command
+      i += 1
     end
+  end
 
-    def log_debug_info(title)
-      if defined?(DEBUG) && self.length > 0
-        puts
-        puts title
-        self.each{|c| puts "  #{c[:input]}" }
-        #pp self 
-        puts
-      end
+  def add(command)
+    self << command unless has_command? command
+  end
+
+  def log_debug_info(title)
+    if defined?(DEBUG) && length.positive?
+      puts
+      puts title
+      each { |c| puts "  #{c[:input]}" }
+      # pp self
+      puts
     end
+  end
+
+  def has_command?(command)
+    return true if command.is_a?(String) && !include?(command)
 
-    def has_command? command
-      return true if(command.kind_of?(String) && !include?(command))
-      if(command.kind_of?(Command))
-        self.each{|c|
-          if c.kind_of?(String)
-            return true if command[:input] == c
-          else
-            return true if(c[:input] == command[:input])
-          end
-        }
+    if command.is_a?(Command)
+      each do |c|
+        if c.is_a?(String)
+          return true if command[:input] == c
+        elsif c[:input] == command[:input]
+          return true
+        end
       end
-      false
     end
+    false
+  end
 
-    def add_quiet command
-      add Command.new({ :input => command, :quiet => true })
-    end
+  def add_quiet(command)
+    add Command.new({ input: command, quiet: true })
+  end
 
-    def add_passive command
-      add Command.new({ :input => command, :quiet => true, :ignore_failure => true })
-    end
+  def add_passive(command)
+    add Command.new({ input: command, quiet: true, ignore_failure: true })
+  end
 
-    def to_html
-      html=Array.new
-      html << '<div>'
-      self.each{|e|
-        html << e.to_html if e.respond_to?(:to_html)
-      }
-      html << '</div>'
-      html.join
+  def to_html
+    html = []
+    html << "<div>"
+    each do |e|
+      html << e.to_html if e.respond_to?(:to_html)
     end
-
-end
+    html << "</div>"
+    html.join
+  end
+end