gitgem 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d32c4e13465683f9d3324fe3049c6112a081175
-  data.tar.gz: 45f0bb2357632ddbdaada5d1b9f009cf6f2bbeb7
+  metadata.gz: 62f651ebd2d42e35bb2fe68b6234ba1317fbacad
+  data.tar.gz: cd48647a970eea69fb6e42d7fa8d0221206a7808
 SHA512:
-  metadata.gz: 3366bd301de4e256801dc63364db2ae8d24a65aee4ad7f8f46841745c83d42a49efd747492e07559f762af045c41fe6d5b7fc680b5099a9b1a25902eaeab2a2a
-  data.tar.gz: 94f1c336de8c35bde97d0a4321cefa07adfa5640c0f185adc683c1014cb583bc5f26469e7f311cc95c816132f55f6668b69a4a3ab10602ce7f1e1a4c2c08d1f2
+  metadata.gz: 2926ba3404ad80d45b8ad7b60a7aca47ac1b4eeb1e871145ca5f6a55dfd78044812357d61f61494c2559673434b442f42090304b67929bafefd48d940a68d457
+  data.tar.gz: 9329f01fc6682e2d054132fac344593913281045ea5567127434de0578952e975a3a8a38bf1e3b00d5ac78c1be67fc4641072895353c1c87319c90e256f35e89

data/bin/gitgem

@@ -1,53 +1,167 @@
 #!/usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 
-$LOAD_PATH.push File.expand_path("../../lib", __FILE__)
+lib = File.expand_path(File.join(__dir__, "../lib"))
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-require 'optparse'
+require 'gli'
 
+require 'version'
 require 'gitgem/action'
 
-ARGV << '-h' if ARGV.empty?
-action = ARGV.shift unless ARGV.first.start_with?("-")
+include GLI::App
 
-options = {}
-option_parser = OptionParser.new do |opts|
-  opts.banner = "Here is help messages of the command line tool.\nAction Suppored: 'add', 'remove', 'install', 'uninstall'."
+program_desc 'Install gem from git repo'
+version GitGem::VERSION
 
-  opts.on('-r REPO', '--repo Repo', 'Specify git repo') do |value|
-    options[:repo] = value
+subcommand_option_handling :normal
+arguments :strict
+
+desc "Add git repo"
+arg_name '-r repo -a alias'
+command :add do |c|
+
+  c.desc 'Specify git repo'
+  c.arg_name 'ssh@xxx.git'
+  c.flag [:r, :repo]
+
+  c.desc 'Specify a short name of git repo'
+  c.arg_name 'alias'
+  c.flag [:a, :alias]
+
+  c.action do |_, opts, _|
+    repo = options[:r]
+    repo_alias = options[:a]
+    GitGem::Action.add(repo_alias, repo)
   end
+end
+
+desc "Remove git repo by alias"
+arg_name '-a alias'
+command :remove do |c|
 
-  opts.on('-a ALIAS', '--alias Alias', 'Make Alias') do |value|
-    options[:alias] = value
+  c.desc 'Alias of git repo'
+  c.arg_name 'alias'
+  c.flag [:a, :alias]
+
+  c.action do |_, opts, _|
+    repo_alias = options[:a]
+    GitGem::Action.remove(repo_alias)
   end
+end
+
+desc "Install gem from git repo"
+arg_name '-a alias -g gem -n bindir'
+command :install do |c|
+
+  c.desc 'Alias of git repo'
+  c.arg_name 'alias'
+  c.flag [:a, :alias]
+
+  c.desc 'Name of gem'
+  c.arg_name 'gitgem'
+  c.flag [:g, :gem]
 
-  opts.on('-g GEM', '--gem Gem', 'Install GEM') do |value|
-    argvs = value.split("/")
-    options[:alias] = argvs.shift
-    options[:gem_dir] = argvs.join("/")
+  c.desc 'dir will install'
+  c.arg_name '/usr/local/bin'
+  c.flag [:n, :bindir]
+
+  c.action do |_, opts, _|
+    repo = options[:a]
+    gem_name = options[:g]
+    bindir = options[:n]
+    GitGem::Action.install(repo, gem_name, bindir)
   end
+end
+
+desc "Uninstall gem"
+arg_name '-a alias -g gem'
+command :uninstall do |c|
+
+  c.desc 'Alias of git repo'
+  c.arg_name 'alias'
+  c.flag [:a, :alias]
+
+  c.desc 'Name of gem'
+  c.arg_name 'gitgem'
+  c.flag [:g, :gem]
 
-  opts.on('-h', '--help', 'Show this message') { puts opts; exit }
-  opts.on('-v', '--version', 'Show version') { exit }
-end.parse!
-
-case action
-when 'add'
-  repo = options[:repo]
-  repo_alias = options[:alias]
-  GitGem::Action.add(repo_alias, repo)
-when 'remove'
-  repo = options[:alias]
-  GitGem::Action.remove(repo)
-when 'install'
-  repo = options[:alias]
-  gem_dir = options[:gem_dir]
-  GitGem::Action.install(repo, gem_dir)
-when 'uninstall'
-  repo = options[:alias]
-  gem_dir = options[:gem_dir]
-  GitGem::Action.uninstall(repo, gem_dir)
-else
-  abort("Could not find action named '#{action}'")
+  c.desc 'dir will uninstall'
+  c.arg_name '/usr/local/bin'
+  c.flag [:n, :bindir]
+
+  c.action do |_, opts, _|
+    repo = options[:a]
+    gem_name = options[:g]
+    bindir = options[:n]
+    GitGem::Action.uninstall(repo, gem_name, bindir)
+  end
 end
+
+exit run(ARGV)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ARGV << '-h' if ARGV.empty?
+# action = ARGV.shift unless ARGV.first.start_with?("-")
+#
+# options = {}
+# option_parser = OptionParser.new do |opts|
+#   opts.banner = "Here is help messages of the command line tool.\nAction Suppored: 'add', 'remove', 'install', 'uninstall'."
+#
+#   opts.on('-r REPO', '--repo Repo', 'Specify git repo') do |value|
+#     options[:repo] = value
+#   end
+#
+#   opts.on('-a ALIAS', '--alias Alias', 'Make Alias') do |value|
+#     options[:alias] = value
+#   end
+#
+#   opts.on('-g GEM', '--gem Gem', 'Install GEM') do |value|
+#     argvs = value.split("/")
+#     options[:alias] = argvs.shift
+#     options[:gem_dir] = argvs.join("/")
+#   end
+#
+#   opts.on('-h', '--help', 'Show this message') { puts opts; exit }
+#   opts.on('-v', '--version', 'Show version') { exit }
+# end.parse!
+#
+# case action
+# when 'add'
+#   repo = options[:repo]
+#   repo_alias = options[:alias]
+#   GitGem::Action.add(repo_alias, repo)
+# when 'remove'
+#   repo = options[:alias]
+#   GitGem::Action.remove(repo)
+# when 'install'
+#   repo = options[:alias]
+#   gem_dir = options[:gem_dir]
+#   GitGem::Action.install(repo, gem_dir)
+# when 'uninstall'
+#   repo = options[:alias]
+#   gem_dir = options[:gem_dir]
+#   GitGem::Action.uninstall(repo, gem_dir)
+# else
+#   abort("Could not find action named '#{action}'")
+# end

data/lib/gitgem/action.rb

@@ -36,7 +36,7 @@ module GitGem
         system("sed -i '' '/#{repo_alias}=/d' #{alias_path}")
       end
 
-      def install(repo_alias, gem_dir)
+      def install(repo_alias, gem_dir, bindir)
         abort("Please specify alias like alias/gem") if repo_alias.nil? || repo_alias.empty?
         result = read_alias(repo_alias)
         abort("Could not find alias named #{repo_alias}, please check again.") if result.nil?
@@ -64,7 +64,11 @@ module GitGem
         abort("Could not find gemspec in #{File.join(Dir.pwd)}") if gemspecs.nil? || gemspecs.empty?
         abort("Mutiple gemspecs found in #{File.join(Dir.pwd)}") if gemspecs.count > 1
 
-        result = system("gem build #{gemspecs.first}")
+        Dir.glob("*.gem").each do |gem|
+          FileUtils.rm_rf(gem)
+        end
+
+        result = system("sudo gem build #{gemspecs.first}")
 
         abort("Fail to build gemspec") unless result
 
@@ -72,14 +76,15 @@ module GitGem
         abort("Could not find gem in #{File.join(Dir.pwd)}") if gemspecs.nil? || gemspecs.empty?
 
         # 获取最新 gem
-        gem = gems.sort_by { |f| File.mtime(f) }.reverse.first
+        gem = gems.first
+        bin = "-n #{bindir}" unless bindir.nil?
 
-        system("gem install #{gem}")
+        system("sudo gem install #{gem} #{bin}")
 
         Dir.chdir(pwd)
       end
 
-      def uninstall(repo_alias, gem_dir)
+      def uninstall(repo_alias, gem_name, bindir)
         abort("Please specify alias like alias/gem") if repo_alias.nil? || repo_alias.empty?
         result = read_alias(repo_alias)
         abort("Could not find alias named #{repo_alias}, please check again.") if result.nil?
@@ -90,10 +95,10 @@ module GitGem
 
         gems = Dir.glob(File.join(repo_dir, gem_dir, "*.gem"))
         abort("Could not find gem in #{File.join(repo_dir, gem_dir)}") if gems.nil? || gems.empty?
-        gems.each do |gem|
-          gem_name = File.basename(gem, ".gem").split("-")[0...-1].join("-")
-          system("gem uninstall #{gem_name}")
-        end
+
+        bin = "-n #{bindir}" unless bindir.nil?
+        gem_name = File.basename(gems.first, ".gem").split("-")[0...-1].join("-")
+        system("sudo gem unisntall #{gem_name} #{bin}")
       end
 
       private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitgem
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - saitjr
@@ -9,7 +9,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2018-01-10 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: gli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.17'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.17.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.17'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.17.1
 description: Install gem from git repo !
 email: tangjr.work@gmail.com
 executables: