gb 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7906c461cd27972045e125ef182976ef576a779d38779df2977d1db98c512ae2
-  data.tar.gz: f62642d10be7fb980816de0d755efc133d9c45d24567127e9df9d5a35c15cdd8
+  metadata.gz: 6cbb144ce7b27e5b2d0baf6bef7ad30b081f2b858e7269575fe8077f7a82836a
+  data.tar.gz: 281cae42940517465d86449a455fd1a461059ec8863227a549515b6c0d3329d9
 SHA512:
-  metadata.gz: 94461a92b513498eaf6c2ba20c219645ada7528066057ca4ad57c55e3c65d400fb5be6c491384a3adf18466b2437e2c73eaeda3e32986c2c50a8c339dabc4333
-  data.tar.gz: c0aabb519e76d5de400bf366b8a9170bc5cf4e0fc8d3a9837965e79fb62a7ad0d28d3b03e40aa3cc6d8e4c753ded1e15a13309b1cb6fb8779309c1be32c626c5
+  metadata.gz: 80d86fa85596b45d698be35d7c3e4601ecbc7f994665d257b388f1e9480088866a4b8e9d3fd17f38c6def6b8e965e84c1f5bb30b728ce14fa9db585ae5139d1e
+  data.tar.gz: 5961753dc5033357b96cb524339accb519275347ff53b5c92a68487b6c0ef0e47dfd6906a68ed0401c99d20485a9353e670efa66490175cf559d4925bb5c334b

data/README.md

@@ -1,7 +1,7 @@
 # Gb
 GB是针对GitLab开发的一款管理工具，使用ruby开发，简化对多个git版本库的管理，方便代码同步及代码提交review。
 
-## Installation
+## 安装
 
 Add this line to your application's Gemfile:
 
@@ -17,12 +17,13 @@ Or install it yourself as:
 
     $ gem install gb
 
-## Usage
+## 使用
 
 ### 1、创建gb配置文件Gb.yml
 ```ruby
 #创建本地文件Gb.yml，根据提示输入Gitlab的private token
 gb create
+
 #或通过在线url地址下载Gb.yml
 gb create --config_url=[url]
 ```

data/lib/commands/review.rb

@@ -47,7 +47,7 @@ module Gb
 
     def run_in_workspace
 
-      @working_branch = self.workspace_config.workspace_branch
+      @working_branch = self.workspace_config.work_branch
       @remote_branch = self.workspace_config.remote_branch
 
       # api: https://www.rubydoc.info/gems/gitlab/toplevel

data/lib/commands/status.rb

@@ -12,6 +12,10 @@ module Gb
     DESC
 
     def run_in_workspace
+      workspace_config = self.workspace_config
+      info "current work branch '#{workspace_config.work_branch}'"
+      info "track remote branch '#{workspace_config.remote_branch}'."
+      puts
 
       self.gb_config.projects.each do |project|
         project_path = File.expand_path(project.name, './')
@@ -20,7 +24,10 @@ module Gb
           info "for project '#{project.name}'..."
           g = Git.open(project_path)
 
-          info "current branch '#{g.current_branch}'"
+          if workspace_config.work_branch != g.current_branch
+            error "current branch(#{g.current_branch}) is not work branch."
+            puts
+          end
 
           changed = g.status.changed
           added = g.status.added

data/lib/commands/sync.rb

@@ -16,7 +16,7 @@ module Gb
       remote = 'origin'
       workspace_config = self.workspace_config
 
-      info "current work branch '#{workspace_config.workspace_branch}', remote branch '#{workspace_config.remote_branch}'."
+      info "current work branch '#{workspace_config.work_branch}', remote branch '#{workspace_config.remote_branch}'."
 
       self.gb_config.projects.each do |project|
         project_path = File.expand_path(project.name, './')
@@ -24,12 +24,13 @@ module Gb
         if File.exist?(project_path)
           info "sync project '#{project.name}'..."
           g = Git.open(project_path)
-          if workspace_config.workspace_branch != g.current_branch
-            error "current branch is not work branch(#{workspace_config.workspace_branch})."
-            exit(1)
-          end
+          # if workspace_config.workspace_branch != g.current_branch
+          #   error "current branch is not work branch(#{workspace_config.workspace_branch})."
+          #   exit(1)
+          # end
+          g.checkout(workspace_config.work_branch)
           g.fetch(remote, :p => true, :t => true)
-          g.pull("origin", workspace_config.workspace_branch)
+          g.pull("origin", workspace_config.work_branch)
           g.pull("origin", workspace_config.remote_branch)
           puts
 

data/lib/commands/workspace.rb

@@ -16,7 +16,7 @@ module Gb
       remote = 'origin'
       workspace_config = self.workspace_config
 
-      info "current work branch '#{workspace_config.workspace_branch}'"
+      info "current work branch '#{workspace_config.work_branch}'"
       info "track remote branch '#{workspace_config.remote_branch}'."
       puts
 
@@ -27,6 +27,7 @@ module Gb
           info "Project '#{project.name}'..."
           g = Git.open(project_path)
           info "current branch '#{g.current_branch}'."
+          puts
         else
           error "please run 'gb init first."
           break

data/lib/config/work_space_config.rb

@@ -2,24 +2,24 @@
 module Gb
   class WorkSpaceConfig
     attr_reader :remote_branch
-    attr_reader :workspace_branch
+    attr_reader :work_branch
 
-    def initialize(remote_branch, workspace_branch)
+    def initialize(remote_branch, work_branch)
       @remote_branch = remote_branch
-      @workspace_branch = workspace_branch
+      @work_branch = work_branch
     end
 
     def self.load_file(yaml_filename)
       node = YAML.load_file(yaml_filename)
       remote_branch = node['remote_branch']
-      workspace_branch = node['workspace_branch']
-      return WorkSpaceConfig.new(remote_branch, workspace_branch)
+      work_branch = node['work_branch']
+      return WorkSpaceConfig.new(remote_branch, work_branch)
     end
 
     def save(path)
       File.open(path, 'w') do |file|
-        Psych.dump({'remote_branch' => @remote_branch, 'workspace_branch' => @workspace_branch}, file)
+        Psych.dump({'remote_branch' => @remote_branch, 'work_branch' => @work_branch}, file)
       end
     end
   end
-end
+end

data/lib/gb/version.rb

@@ -1,3 +1,3 @@
 module Gb
-  VERSION = "0.1.1"
-end
+  VERSION = "0.1.2"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - binluo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-30 00:00:00.000000000 Z
+date: 2019-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab