gb 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c0e6e6636ccfd5a082792e1b651975da5b1a6e19484ed15dbe5a55238f3b0f2
-  data.tar.gz: d5a5dd3a53178fb05a5a585eb4d11c5021004166bed1f39458cbc9e8b9649d5f
+  metadata.gz: 3b92ad8cd61b9c2d62fb116b18f32d32427991a19ff500143a73ae56bfb83594
+  data.tar.gz: 11abb0149753c7034552e921f7cc99def1d8e0ef69d5047c760998fd6306d43e
 SHA512:
-  metadata.gz: 40fc60a48b964c9de9f621562f58512deeac842d542a098c299dacd0059a8fb8f75b6e761e0f012fac34fea8a42c123d449a0226937fdcf2ae349e78a72844c9
-  data.tar.gz: d37222953e9e5d83df8e84c856daca6e473762200080a4e8b02cc2a6cf71e85e99f2d124fa0a2483d89a522213a7fbf389246d90a93f55adad19d9436edf931a
+  metadata.gz: 25dc38f5ed524a36c9e73845c846ea78e9f5772c8ce2d6feb9b5d7bd8c9d5dcda30e93b503ebaed158b64104abd1f66e0502591cdb6b0da21b4ded543f3d63a6
+  data.tar.gz: 344af45ef1f1baa0b2810a738f5aacb6c4d1cfe8610226d86b59ad6f34d8a63bc0bc104d3d619ec74ff1727202c35e6812f5db0e66426f13717ad37af989f899

data/lib/commands/create_tag.rb

@@ -39,7 +39,7 @@ module Gb
       end
     end
 
-    def run
+    def run_in_config
       # api: https://www.rubydoc.info/gems/gitlab/toplevel
       # document: https://narkoz.github.io/gitlab/cli
 

data/lib/commands/delete_tag.rb

@@ -34,7 +34,7 @@ module Gb
       end
     end
 
-    def run
+    def run_in_config
       # api: https://www.rubydoc.info/gems/gitlab/toplevel
       # document: https://narkoz.github.io/gitlab/cli
 

data/lib/commands/forall.rb

@@ -29,7 +29,7 @@ module Gb
       end
     end
 
-    def run
+    def run_in_config
 
       self.gb_config.projects.each do |project|
         project_path = File.expand_path(project.name, './')

data/lib/commands/merge.rb

@@ -44,7 +44,7 @@ module Gb
       end
     end
 
-    def run_in_workspace
+    def run_in_config
       remote = "origin"
 
       # api: https://www.rubydoc.info/gems/gitlab/toplevel

data/lib/commands/review.rb

@@ -47,7 +47,7 @@ module Gb
       # end
     end
 
-    def run_in_workspace
+    def run_in_config
 
       @working_branch = self.workspace_config.work_branch
       @remote_branch = self.workspace_config.remote_branch
@@ -194,7 +194,7 @@ module Gb
           end until @title.length > 0
         end
 
-        if at_user.nil?
+        if at_user.nil? && !users.nil?
           info "Find user for @."
           puts "0、none".green
           users.each_with_index do |user, index|

data/lib/commands/start.rb

@@ -37,7 +37,7 @@ module Gb
       end
     end
 
-    def run
+    def run_in_config
       remote = 'origin'
       workspace_config = WorkSpaceConfig.new(@remote_branch, @working_branch)
 

data/lib/commands/status.rb

@@ -11,7 +11,7 @@ module Gb
       查看工作分支代码状态.
     DESC
 
-    def run_in_workspace
+    def run_in_config
       workspace_config = self.workspace_config
       info "current work branch '#{workspace_config.work_branch}'"
       info "track remote branch '#{workspace_config.remote_branch}'."

data/lib/commands/sync.rb

@@ -11,7 +11,7 @@ module Gb
       根据yml配置，更新代码.
     DESC
 
-    def run_in_workspace
+    def run_in_config
 
       remote = 'origin'
       workspace_config = self.workspace_config

data/lib/commands/workspace.rb

@@ -11,7 +11,7 @@ module Gb
       查看当前工作区信息.
     DESC
 
-    def run_in_workspace
+    def run_in_config
 
       remote = 'origin'
       workspace_config = self.workspace_config

data/lib/gb/version.rb

@@ -1,3 +1,3 @@
 module Gb
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/sub_command.rb

@@ -12,14 +12,8 @@ module Gb
     self.ignore_in_command_lookup = true
     attr_reader :gb_config
 
-    def self.options
-      [
-          ['--config=[Gb.yml]', 'gb配置, 默认为Gb.yml'],
-      ].concat(super)
-    end
-
     def initialize(argv)
-      @yml = argv.option('config')
+      # @yml = argv.option('config')
       if @yml.nil?
         @yml = 'Gb.yml'
       end
@@ -31,31 +25,31 @@ module Gb
     end
 
     def run
-      workspace_path = "./"
-      find_workspace = false;
+      config_dir = "./"
+      find_config = false;
       begin
         result = nil
-        Dir.chdir(workspace_path) do
-          result = Dir.glob('.gb', File::FNM_DOTMATCH)
+        Dir.chdir(config_dir) do
+          result = Dir.glob('Gb.yml', File::FNM_DOTMATCH)
         end
         if result.length > 0
-          find_workspace = true
+          find_config = true
           break
         else
-          workspace_path = File.expand_path("../", workspace_path)
+          config_dir = File.expand_path("../", config_dir)
         end
-      end while workspace_path.length > 0 && workspace_path != "/"
+      end while config_dir.length > 0 && config_dir != "/"
 
-      if find_workspace
-        Dir.chdir(workspace_path) do
-          self.run_in_workspace()
+      if find_config
+        Dir.chdir(config_dir) do
+          self.run_in_config()
         end
       else
         raise Error.new("Current path is not gb workspace. please run 'gb start' first.")
       end
     end
 
-    def run_in_workspace
+    def run_in_config
 
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gb
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - binluo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-25 00:00:00.000000000 Z
+date: 2019-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab