raykit 0.0.469 → 0.0.471

data/lib/raykit/git/repository.rb

@@ -1,244 +1,244 @@
-# frozen_string_literal: true
-
-module Raykit
-  module Git
-    # Functionality to manage a remote git repository
-    class Repository
-      # The url of the remote repository
-      attr_accessor :url
-      attr_accessor :clone_directory, :work_directory
-
-      def initialize(url)
-        @url = url
-        @clone_directory = Raykit::Git::Directory.new(get_dev_dir("clone"))
-        @work_directory = Raykit::Git::Directory.new(get_dev_dir("work"))
-      end
-
-      def short_name()
-        @url.split("/").last.gsub(".git", "")
-      end
-
-      def to_json(*_args)
-        JSON.generate({ "url" => @url })
-      end
-
-      def self.parse(json)
-        hash = JSON.parse(json)
-        Repository.new(hash["url"])
-      end
-
-      # The relative path is a valid local path name derived from the url
-      def relative_path
-        @url.gsub("https://", "").gsub(".git", "").gsub("http://", "")
-      end
-
-      def get_dev_dir(dir)
-        dev_dir = Environment.get_dev_dir(dir)
-        Raykit::Environment::normalize_path("#{dev_dir}/#{relative_path}")
-      end
-
-      # Clone the repository to a specific directory
-      def clone(directory, depth = 0)
-        if depth.zero?
-          PROJECT.run("git clone #{@url} #{directory}")
-        else
-          PROJECT.run("git clone #{@url} #{directory} --depth #{depth}")
-        end
-      end
-
-      # default branch
-      def default_branch
-        update_local_clone_directory
-        if Dir.exist?(local_clone_directory)
-          Dir.chdir(local_clone_directory) do
-            # refs/remotes/origin/master
-            default_branch = `git symbolic-ref refs/remotes/origin/HEAD`.split("/").last.strip
-            return default_branch
-          end
-        end
-        "main"
-      end
-
-      # The branches for the git repository
-      def branches
-        results = []
-        update_local_clone_directory
-        if Dir.exist?(local_clone_directory)
-          Dir.chdir(local_clone_directory) do
-            `git branch`.split('\n').each do |line|
-              branch = line.gsub("*", "").strip
-              results.insert(-1, branch) if branch.length.positive?
-            end
-          end
-        end
-        results
-      end
-
-      # The latest commit id for a branch of the repostiory
-      def latest_commit(branch)
-        if checkout_local_clone_directory_branch(branch)
-          update_local_clone_directory
-          Dir.chdir(local_clone_directory) do
-            text = `git log -n 1`
-            scan = text.scan(/commit (\w+)\s/)
-            return scan[0][0].to_s
-          end
-        end
-        ""
-      end
-
-      # The latest tag for a branch of the repository
-      def latest_tag(branch)
-        return `git describe --abbrev=0`.strip if checkout_local_clone_directory_branch(branch)
-
-        ""
-      end
-
-      private def local_clone_directory
-        clone_dir = "#{Environment.get_dev_dir("clone")}/#{relative_path}"
-      end
-
-      public def update_local_clone_directory
-        if Dir.exist?(local_clone_directory)
-          Dir.chdir(local_clone_directory) do
-            pull = Raykit::Command.new("git pull")
-            pull.run
-            pull
-            # t = `git pull`
-          end
-        else
-          PROJECT.run("git clone #{@url} #{local_clone_directory}")
-        end
-      end
-
-      private def checkout_local_clone_directory_branch(branch)
-        update_local_clone_directory
-        if Dir.exist?(local_clone_directory)
-          Dir.chdir(local_clone_directory) do
-            check = `git branch`
-            t = `git checkout #{branch}` unless check.include?("* #{branch}")
-            check = `git branch`
-            return check.include?("* #{branch}")
-          end
-        end
-        false
-      end
-
-      def clobber
-        ["work", "clone", "make"].each { |d|
-          dir = get_dev_dir(d)
-          if (Dir.exist?(dir))
-            begin
-              puts "  deleting #{dir}"
-              FileUtils.rm_rf(dir)
-              FileUtils.rm(dir) if (Dir.exist?(dir))
-            rescue
-              puts "  problem while deleting #{dir}"
-            end
-          end
-        }
-      end
-
-      def pull
-        Raykit::Git::Repository::work_pull(url)
-        update_local_clone_directory
-      end
-
-      def work(command, force = false)
-        pull if (!Dir.exist?(get_dev_dir("work")))
-        fcommand = Raykit::FileSystem::replace_invalid_chars(command)
-        filename = "#{Raykit::Environment::log_dir}/work_#{fcommand}_#{relative_path.gsub("/", "-")}.json"
-        if (Raykit::Git::Directory.new(get_dev_dir("work")).outstanding_commit? || force)
-          puts "  outstanding commit in #{get_dev_dir("work")}"
-          work_cmd = Raykit::Git::Repository::work_url(url, command)
-          work_cmd.save_as(filename)
-          return work_cmd
-        else
-          if (File.exist?(filename))
-            return Raykit::Command::parse(IO.read(filename))
-          else
-            work_cmd = Raykit::Git::Repository::work_url(url, command)
-            work_cmd.save_as(filename)
-          end
-          #
-        end
-      end
-
-      def make(command, force = false)
-        commit_id = "#{latest_commit(default_branch)}"
-        make_id = "make_#{relative_path.gsub("/", "-")}_#{commit_id}"
-        fcommand = Raykit::FileSystem::replace_invalid_chars(command)
-        filename = "#{Raykit::Environment::log_dir}/#{make_id}_#{fcommand}.json"
-        if (!force && File.exist?(filename))
-          return Raykit::Command::parse(IO.read(filename))
-        else
-          make_cmd = Raykit::Git::Repository::make_url(url, commit_id, "rake default")
-          make_cmd.save_as(filename)
-          return make_cmd
-        end
-      end
-
-      def self.work_pull(url)
-        repo = Raykit::Git::Repository.new(url)
-        work_dir = repo.get_dev_dir("work")
-        repo.clone(work_dir) if !Dir.exist?(work_dir)
-        Dir.chdir(work_dir) do
-          run("git pull")
-        end
-      end
-
-      def self.work_integrate(url)
-        repo = Raykit::Git::Repository.new(url)
-        work_dir = repo.get_dev_dir("work")
-        repo.clone(work_dir) if !Dir.exist?(work_dir)
-        Dir.chdir(work_dir) do
-          run("git pull")
-          run("rake integrate")
-        end
-      end
-
-      def self.work_url(url, cmd)
-        repo = Raykit::Git::Repository.new(url)
-        puts "  work #{url} #{cmd}"
-        work_dir = repo.get_dev_dir("work")
-        repo.clone(work_dir) if !Dir.exist?(work_dir)
-        Dir.chdir(work_dir) do
-          run("git pull")
-          cmd = Raykit::Command.new(cmd)
-          cmd = cmd.run().summary()
-          cmd
-        end
-      end
-
-      def self.make_url(url, commit_id, command)
-        repo = Raykit::Git::Repository.new(url)
-        puts "  make #{url} #{commit_id} #{command}"
-        make_dir = Raykit::Environment::normalize_path(repo.get_dev_dir("make") + "/" + commit_id)
-        FileUtils.mkdir_p(repo.get_dev_dir("make")) if !Dir.exist?(repo.get_dev_dir("make"))
-        if (Dir.exist?(make_dir))
-          FileUtils.rm_rf(make_dir)
-        end
-        run("git clone #{url} #{make_dir}")
-        cmd = 0
-        Dir.chdir(make_dir) do
-          run("git reset --hard #{commit_id}")
-          FileUtils.rm_rf(".git")
-          cmd = Raykit::Command.new(command)
-          cmd = cmd.run().summary()
-        end
-        FileUtils.rm_rf(make_dir) if (cmd.exitstatus == 0)
-        cmd
-      end
-
-      def self.backup(url, backup_dir)
-        if (Dir.exist?(backup_dir))
-          Dir.chdir(backup_dir) do
-            run("git pull")
-          end
-        else
-          run("git clone #{url} \"#{backup_dir}\"")
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Raykit
+  module Git
+    # Functionality to manage a remote git repository
+    class Repository
+      # The url of the remote repository
+      attr_accessor :url
+      attr_accessor :clone_directory, :work_directory
+
+      def initialize(url)
+        @url = url
+        @clone_directory = Raykit::Git::Directory.new(get_dev_dir("clone"))
+        @work_directory = Raykit::Git::Directory.new(get_dev_dir("work"))
+      end
+
+      def short_name()
+        @url.split("/").last.gsub(".git", "")
+      end
+
+      def to_json(*_args)
+        JSON.generate({ "url" => @url })
+      end
+
+      def self.parse(json)
+        hash = JSON.parse(json)
+        Repository.new(hash["url"])
+      end
+
+      # The relative path is a valid local path name derived from the url
+      def relative_path
+        @url.gsub("https://", "").gsub(".git", "").gsub("http://", "")
+      end
+
+      def get_dev_dir(dir)
+        dev_dir = Environment.get_dev_dir(dir)
+        Raykit::Environment::normalize_path("#{dev_dir}/#{relative_path}")
+      end
+
+      # Clone the repository to a specific directory
+      def clone(directory, depth = 0)
+        if depth.zero?
+          PROJECT.run("git clone #{@url} #{directory}")
+        else
+          PROJECT.run("git clone #{@url} #{directory} --depth #{depth}")
+        end
+      end
+
+      # default branch
+      def default_branch
+        update_local_clone_directory
+        if Dir.exist?(local_clone_directory)
+          Dir.chdir(local_clone_directory) do
+            # refs/remotes/origin/master
+            default_branch = `git symbolic-ref refs/remotes/origin/HEAD`.split("/").last.strip
+            return default_branch
+          end
+        end
+        "main"
+      end
+
+      # The branches for the git repository
+      def branches
+        results = []
+        update_local_clone_directory
+        if Dir.exist?(local_clone_directory)
+          Dir.chdir(local_clone_directory) do
+            `git branch`.split('\n').each do |line|
+              branch = line.gsub("*", "").strip
+              results.insert(-1, branch) if branch.length.positive?
+            end
+          end
+        end
+        results
+      end
+
+      # The latest commit id for a branch of the repostiory
+      def latest_commit(branch)
+        if checkout_local_clone_directory_branch(branch)
+          update_local_clone_directory
+          Dir.chdir(local_clone_directory) do
+            text = `git log -n 1`
+            scan = text.scan(/commit (\w+)\s/)
+            return scan[0][0].to_s
+          end
+        end
+        ""
+      end
+
+      # The latest tag for a branch of the repository
+      def latest_tag(branch)
+        return `git describe --abbrev=0`.strip if checkout_local_clone_directory_branch(branch)
+
+        ""
+      end
+
+      private def local_clone_directory
+        clone_dir = "#{Environment.get_dev_dir("clone")}/#{relative_path}"
+      end
+
+      public def update_local_clone_directory
+        if Dir.exist?(local_clone_directory)
+          Dir.chdir(local_clone_directory) do
+            pull = Raykit::Command.new("git pull")
+            pull.run
+            pull
+            # t = `git pull`
+          end
+        else
+          PROJECT.run("git clone #{@url} #{local_clone_directory}")
+        end
+      end
+
+      private def checkout_local_clone_directory_branch(branch)
+        update_local_clone_directory
+        if Dir.exist?(local_clone_directory)
+          Dir.chdir(local_clone_directory) do
+            check = `git branch`
+            t = `git checkout #{branch}` unless check.include?("* #{branch}")
+            check = `git branch`
+            return check.include?("* #{branch}")
+          end
+        end
+        false
+      end
+
+      def clobber
+        ["work", "clone", "make"].each { |d|
+          dir = get_dev_dir(d)
+          if (Dir.exist?(dir))
+            begin
+              puts "  deleting #{dir}"
+              FileUtils.rm_rf(dir)
+              FileUtils.rm(dir) if (Dir.exist?(dir))
+            rescue
+              puts "  problem while deleting #{dir}"
+            end
+          end
+        }
+      end
+
+      def pull
+        Raykit::Git::Repository::work_pull(url)
+        update_local_clone_directory
+      end
+
+      def work(command, force = false)
+        pull if (!Dir.exist?(get_dev_dir("work")))
+        fcommand = Raykit::FileSystem::replace_invalid_chars(command)
+        filename = "#{Raykit::Environment::log_dir}/work_#{fcommand}_#{relative_path.gsub("/", "-")}.json"
+        if (Raykit::Git::Directory.new(get_dev_dir("work")).outstanding_commit? || force)
+          puts "  outstanding commit in #{get_dev_dir("work")}"
+          work_cmd = Raykit::Git::Repository::work_url(url, command)
+          work_cmd.save_as(filename)
+          return work_cmd
+        else
+          if (File.exist?(filename))
+            return Raykit::Command::parse(IO.read(filename))
+          else
+            work_cmd = Raykit::Git::Repository::work_url(url, command)
+            work_cmd.save_as(filename)
+          end
+          #
+        end
+      end
+
+      def make(command, force = false)
+        commit_id = "#{latest_commit(default_branch)}"
+        make_id = "make_#{relative_path.gsub("/", "-")}_#{commit_id}"
+        fcommand = Raykit::FileSystem::replace_invalid_chars(command)
+        filename = "#{Raykit::Environment::log_dir}/#{make_id}_#{fcommand}.json"
+        if (!force && File.exist?(filename))
+          return Raykit::Command::parse(IO.read(filename))
+        else
+          make_cmd = Raykit::Git::Repository::make_url(url, commit_id, "rake default")
+          make_cmd.save_as(filename)
+          return make_cmd
+        end
+      end
+
+      def self.work_pull(url)
+        repo = Raykit::Git::Repository.new(url)
+        work_dir = repo.get_dev_dir("work")
+        repo.clone(work_dir) if !Dir.exist?(work_dir)
+        Dir.chdir(work_dir) do
+          run("git pull")
+        end
+      end
+
+      def self.work_integrate(url)
+        repo = Raykit::Git::Repository.new(url)
+        work_dir = repo.get_dev_dir("work")
+        repo.clone(work_dir) if !Dir.exist?(work_dir)
+        Dir.chdir(work_dir) do
+          run("git pull")
+          run("rake integrate")
+        end
+      end
+
+      def self.work_url(url, cmd)
+        repo = Raykit::Git::Repository.new(url)
+        puts "  work #{url} #{cmd}"
+        work_dir = repo.get_dev_dir("work")
+        repo.clone(work_dir) if !Dir.exist?(work_dir)
+        Dir.chdir(work_dir) do
+          run("git pull")
+          cmd = Raykit::Command.new(cmd)
+          cmd = cmd.run().summary()
+          cmd
+        end
+      end
+
+      def self.make_url(url, commit_id, command)
+        repo = Raykit::Git::Repository.new(url)
+        puts "  make #{url} #{commit_id} #{command}"
+        make_dir = Raykit::Environment::normalize_path(repo.get_dev_dir("make") + "/" + commit_id)
+        FileUtils.mkdir_p(repo.get_dev_dir("make")) if !Dir.exist?(repo.get_dev_dir("make"))
+        if (Dir.exist?(make_dir))
+          FileUtils.rm_rf(make_dir)
+        end
+        run("git clone #{url} #{make_dir}")
+        cmd = 0
+        Dir.chdir(make_dir) do
+          run("git reset --hard #{commit_id}")
+          FileUtils.rm_rf(".git")
+          cmd = Raykit::Command.new(command)
+          cmd = cmd.run().summary()
+        end
+        FileUtils.rm_rf(make_dir) if (cmd.exitstatus == 0)
+        cmd
+      end
+
+      def self.backup(url, backup_dir)
+        if (Dir.exist?(backup_dir))
+          Dir.chdir(backup_dir) do
+            run("git pull")
+          end
+        else
+          run("git clone #{url} \"#{backup_dir}\"")
+        end
+      end
+    end
+  end
+end

data/lib/raykit/installer.rb

@@ -1,17 +1,17 @@
-# frozen_string_literal: true
-
-module Raykit
-  class Installer
-    def self.make_msi(wxs_file, source_dir, msi_filename)
-      name = "#{File.basename(wxs_file, ".wxs")}"
-      FileUtils.cp(wxs_file, "#{source_dir}/#{File.basename(wxs_file)}")
-      Dir.chdir(source_dir) do
-        run("candle #{File.basename(wxs_file)}")
-        run("light #{name}.wixobj")
-        FileUtils.cp("#{name}.msi", msi_filename)
-        raise "#{msi_filename} does not exist" if !File.exist?(msi_filename)
-        File.delete("#{name}.wixobj")
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Raykit
+  class Installer
+    def self.make_msi(wxs_file, source_dir, msi_filename)
+      name = "#{File.basename(wxs_file, ".wxs")}"
+      FileUtils.cp(wxs_file, "#{source_dir}/#{File.basename(wxs_file)}")
+      Dir.chdir(source_dir) do
+        run("candle #{File.basename(wxs_file)}")
+        run("light #{name}.wixobj")
+        FileUtils.cp("#{name}.msi", msi_filename)
+        raise "#{msi_filename} does not exist" if !File.exist?(msi_filename)
+        File.delete("#{name}.wixobj")
+      end
+    end
+  end
+end