kameleon-builder 2.10.1 → 2.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40bafaeccf66d6d3149f1af122656d69ca563488fc51cb358e67a607f813d407
-  data.tar.gz: 93d6c6c995fa330626a823c06026e9a3733c0dc72ee1cdc7feefc1d6f0db0362
+  metadata.gz: 5ba36ddda8ead18d06bc94412de565662a2cbed76a2ce71e4994e4f5ee665477
+  data.tar.gz: 8a1e67a68923b413654682b87e14e6c91102b57dc9fd4ed45164f0827b1483cb
 SHA512:
-  metadata.gz: 4ff5b417aced3f8736f9d5d7dbe1f45092310667fbb352903fa9075844222d6e667e86881dca443367d1088d9dee7269d8f185c715ad9615957cda60985b7d07
-  data.tar.gz: e69e617c0ee0eddf3d65dc2c2cef1b878222afbd9d0c7f392d57a93f164e84dd5cd217e8c4ac6f8b7673ad7ceb8355c7c0d60c57e555ba2141ed3211a6c2ca25
+  metadata.gz: 6993ca5f73661525c8a44133eb715d383144b75d5e4c9cc66f73aab1896643d9db09165ddc9af46e1474c2a82b856f1dc8a894582fb398f8d25ec472019878f1
+  data.tar.gz: 205ac5b41d50af596f7428196bfc1c1c6633e6408d5643e3d4e71f323f5117755e863e98432febcca98f0461b421d40a6a3ec08634da50a66f1afe101c38eba8

data/.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 2.10.1
+current_version = 2.10.2
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+))?
 serialize = 
 	{major}.{minor}.{patch}.{release}

data/CHANGES

@@ -1,6 +1,14 @@
 Kameleon CHANGELOG
 ==================
 
+Version 2.10.2
+--------------
+
+Released on April 09th 2020
+- Fix cli help for the repository and template sub-commands
+- Add the git remote url and branch to kameleon repo list
+- Add the 'kameleon repository remove' command
+
 Version 2.10.1
 -------------
 

data/lib/kameleon/cli.rb

@@ -21,16 +21,27 @@ module Kameleon
       end
 
       desc "list", "Lists available repositories."
+      method_option :git, :type => :boolean,
+                    :default => true,
+                    :desc => "show the git repository and branch each repository comes from"
       def list
-        Kameleon::Repository.list
+        Kameleon::Repository.list(options)
       end
 
-      desc "update <NAME>", "Updates repository named <NAME> repository"
+      desc "update <NAME>", "Updates repository named <NAME> from git"
       def update(name)
         Kameleon::Repository.update(name)
       end
       map %w(-h --help) => :help
       map %w(ls) => :list
+
+      desc "remove <NAME>", "Remove repository named <NAME>"
+      def remove(name)
+        Kameleon::Repository.remove(name)
+      end
+      map %w(-h --help) => :help
+      map %w(ls) => :list
+      map %w(rm) => :remove
     end
 
 
@@ -108,9 +119,10 @@ module Kameleon
   class Main < Thor
     include Thor::Actions
 
-    register CLI::Repository, 'repository', 'repository', 'Manages repositories of recipes'
-    # register CLI::Recipe, 'recipe', 'recipe', 'Manages the local recipes'
-    register CLI::Template, 'template', 'template', 'Lists and imports templates'
+    desc 'repository <SUBCOMMAND>', 'Manages repositories of recipes'
+    subcommand 'repository', CLI::Repository
+    desc 'template <SUBCOMMAND>', 'Lists and imports templates'
+    subcommand 'template', CLI::Template
 
     class_option :color, :type => :boolean, :default => Kameleon.default_values[:color],
                  :desc => "Enables colorization in output"
@@ -431,13 +443,6 @@ module Kameleon
         Kameleon.ui.level = "verbose"
       end
       Kameleon.ui.verbose("The level of output is set to #{Kameleon.ui.level}")
-
-      opts = args[1]
-      cmd_name = args[2][:current_command].name
-      if opts.include? "--help" or opts.include? "-h"
-        Main.command_help(Kameleon.ui.shell, cmd_name)
-        raise Kameleon::Exit
-      end
     end
 
     def self.start(*)

data/lib/kameleon/error.rb

@@ -27,4 +27,5 @@ module Kameleon
   class TemplateNotFound < Error; status_code(9) ; end
   class CacheError < Error; status_code(10) ; end
   class ExportError < Error; status_code(11) ; end
+  class RepositoryError < Error; status_code(12) ; end
 end

data/lib/kameleon/repository.rb

@@ -28,6 +28,7 @@ module Kameleon
     def self.update(name)
       check_git_binary
       git_repo = File.join(Kameleon.env.repositories_path, name)
+      raise RepositoryError, "Repository not found '#{name}'" if not File.directory?(git_repo)
       cmd = ["git", "--git-dir", File.join(git_repo, ".git"), "--work-tree",
              git_repo, "pull", "--verbose"]
       process = ChildProcess.build(*cmd)
@@ -37,10 +38,49 @@ module Kameleon
       process.stop
     end
 
-    def self.list
+    def self.list(kwargs = {})
       Dir["#{Kameleon.env.repositories_path}/*"].each do |repo_path|
-        Kameleon.ui.info File.basename("#{repo_path}")
+        if kwargs[:git]
+          show_git_repository(repo_path)
+        else
+          Kameleon.ui.info File.basename(repo_path)
+        end
       end
     end
+
+    def self.remove(name)
+      repo_path = File.join(Kameleon.env.repositories_path, name)
+      raise RepositoryError, "Repository not found '#{name}'" if not File.directory?(repo_path)
+      Kameleon.ui.shell.say "Removing: ", :red, false
+      show_git_repository(repo_path)
+      FileUtils.rm_rf(repo_path)
+    end
+
+    def self.show_git_repository(repo_path)
+      cmd = ["git", "remote", "-v"]
+      r, w = IO.pipe
+      process = ChildProcess.build(*cmd)
+      process.io.stdout = w
+      process.cwd = repo_path
+      process.start
+      w.close
+      url = r.readline.split[1]
+      process.wait
+      process.stop
+      cmd = ["git", "rev-parse", "--abbrev-ref", "HEAD"]
+      r, w = IO.pipe
+      process = ChildProcess.build(*cmd)
+      process.io.stdout = w
+      process.cwd = repo_path
+      process.start
+      w.close
+      branch = r.readline.chomp
+      process.wait
+      process.stop
+      Kameleon.ui.shell.say "#{File.basename("#{repo_path}")}", nil, false
+      Kameleon.ui.shell.say " <-", :magenta, false
+      Kameleon.ui.shell.say " #{url}", :cyan, false
+      Kameleon.ui.shell.say " (#{branch})", :yellow
+    end
   end
 end

data/version.txt

@@ -1 +1 @@
-2.10.1
+2.10.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kameleon-builder
 version: !ruby/object:Gem::Version
-  version: 2.10.1
+  version: 2.10.2
 platform: ruby
 authors:
 - Salem Harrache
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-21 00:00:00.000000000 Z
+date: 2020-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess