bigkeeper 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 875ec925ad5aa51547b3f7ab27520f5e1f8d42d2
-  data.tar.gz: '08f1cfdb43165274549e93edcc5680b56f2b4de4'
+SHA256:
+  metadata.gz: 2af3fd1d2d026824666e8f1898d809c30989787500affa9550dd569adb7c6f37
+  data.tar.gz: b672ad8078c2dbb9576ed9a7f366e301334ef77d253e9ed06084691b1463897c
 SHA512:
-  metadata.gz: 5731521b8fe9eeb01d64428ad71a01ad7e8e32cdfcf0fccb9ad957028fc1e90ce90b7ac1f6d9862b3028da06ac6174c857a4cab76601d21ad0865ffb0f4e3e05
-  data.tar.gz: 6095dfb363e7d84b48794ea1aaeab0edd28e7cb759fa4009ead8907818cce789190d14d3f318807eff3f92de03de4ac6c77b7fa0249ea08c43615d3826578a8e
+  metadata.gz: 713abcd176db1ef408c5b4c93f870157ab56d788af607eb9eb49aebeee72f68f8831d9fd584bc57edd293a47f26195cc316e4efdb2c14aa1d9799cf213ab0a49
+  data.tar.gz: 704f9cdf0743c58597f6109a302fe8941cd99bcaa37a56ed69e37a06a3f43fdbfd0249410abe09ff6dcba21fc4f8a6379fdc0c372c75a9e545f71b1ebd58a7f2

data/Gemfile.lock

@@ -13,14 +13,14 @@ GEM
   remote: https://gems.ruby-china.com/
   specs:
     CFPropertyList (3.0.0)
-    activesupport (4.2.11)
+    activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     ast (2.3.0)
     atomos (0.1.3)
-    big_resources (0.1.1)
+    big_resources (0.1.2)
       chunky_png
       cocoapods
       colorize
@@ -30,50 +30,50 @@ GEM
       gli (~> 2.16)
     chunky_png (1.3.11)
     claide (1.0.2)
-    cocoapods (1.5.3)
+    cocoapods (1.6.1)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.5.3)
+      cocoapods-core (= 1.6.1)
       cocoapods-deintegrate (>= 1.0.2, < 2.0)
-      cocoapods-downloader (>= 1.2.0, < 2.0)
+      cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.3.0, < 2.0)
+      cocoapods-trunk (>= 1.3.1, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (~> 2.0.1)
+      fourflusher (>= 2.2.0, < 3.0)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.6.5)
+      molinillo (~> 0.6.6)
       nap (~> 1.0)
-      ruby-macho (~> 1.1)
-      xcodeproj (>= 1.5.7, < 2.0)
-    cocoapods-core (1.5.3)
+      ruby-macho (~> 1.4)
+      xcodeproj (>= 1.8.1, < 2.0)
+    cocoapods-core (1.6.1)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.2)
+    cocoapods-deintegrate (1.0.4)
     cocoapods-downloader (1.2.2)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
-    cocoapods-stats (1.0.0)
+    cocoapods-stats (1.1.0)
     cocoapods-trunk (1.3.1)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.1.0)
     colored2 (3.1.2)
     colorize (0.8.1)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
     escape (0.0.4)
-    fourflusher (2.0.1)
+    fourflusher (2.2.0)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     gli (2.18.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    minitest (5.8.5)
+    minitest (5.11.3)
     molinillo (0.6.6)
     nanaimo (0.2.6)
     nap (1.1.0)
@@ -93,13 +93,13 @@ GEM
       rainbow (>= 2.2.2, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-macho (1.3.1)
+    ruby-macho (1.4.0)
     ruby-progressbar (1.9.0)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     unicode-display_width (1.3.0)
-    xcodeproj (1.7.0)
+    xcodeproj (1.8.2)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -110,7 +110,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  big_resources
+  big_resources (~> 0.1.2)
   big_stash (~> 0.1)
   bigkeeper!
   bundler (~> 1.15)

data/big_keeper.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "gli", "~> 2.16"
   spec.add_development_dependency "big_stash", "~> 0.1"
-  spec.add_development_dependency "big_resources"
+  spec.add_development_dependency "big_resources", "~> 0.1.2"
   spec.add_development_dependency "cocoapods"
   spec.add_development_dependency "plist"
   spec.add_development_dependency "colorize"

data/bin/big

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# require "bundler/setup"
+require "bundler/setup"
 require "big_keeper"
 
 # You can add fixtures and/or initialization code here to make experimenting

data/lib/big_keeper.rb

@@ -27,7 +27,8 @@ module BigKeeper
 
   flag %i[p path], default_value: './'
   flag %i[v ver], default_value: 'Version in Bigkeeper file'
-  flag %i[u user], default_value: GitOperator.new.user.gsub(/[^0-9A-Za-z]/, '').downcase
+  flag %i[u user], default_value: GitOperator.new.user
+  flag %i[l log], default_value: true
 
   if VerifyOperator.already_in_process?
     p %Q(There is another 'big' command in process, please wait)
@@ -44,7 +45,7 @@ module BigKeeper
   end
 
   post do |global_options,command,options,args|
-    LeanCloudLogger.instance.end_log(true)
+    LeanCloudLogger.instance.end_log(true, global_options[:log] == "true")
   end
 
   feature_and_hotfix_command(GitflowType::FEATURE)

data/lib/big_keeper/util/git_operator.rb

@@ -127,7 +127,14 @@ module BigKeeper
     end
 
     def user
-      `git config user.name`.chop
+      name = `git config user.name`.chop
+      cn_reg = /[\u4e00-\u9fa5]{1}/
+      cn_arr = name.scan(cn_reg)
+      if cn_arr.count > 0
+        Logger.error("git config user.name has Chinese character")
+      else
+        name.gsub(/[^0-9A-Za-z]/, '').downcase
+      end
     end
 
     def tag(path, version)
@@ -216,6 +223,4 @@ module BigKeeper
 
   end
 
-  # p GitOperator.new.user
-  # BigStash::StashOperator.new("/Users/mmoaay/Documents/eleme/BigKeeperMain").list
 end

data/lib/big_keeper/util/leancloud_logger.rb

@@ -21,7 +21,7 @@ module BigKeeper
       @path = global_options['path']
     end
 
-    def end_log(is_success)
+    def end_log(is_success, is_show_log)
       @end_timestamp = Time.new.to_i
       @is_success = is_success
       @version = BigkeeperParser.version if @version == 'Version in Bigkeeper file'
@@ -34,12 +34,13 @@ module BigKeeper
       parameter = parameter.merge('version' => @version) unless @version == nil || @version == ""
       parameter = parameter.merge('parameter' => @parameter) unless @parameter == nil || @parameter == ""
 
-      leancloud_file = @command.split("/").first
-
-      send_log_cloud(leancloud_file, parameter)
+      if @command
+        leancloud_file = @command.split("/").first
+        send_log_cloud(leancloud_file, parameter, is_show_log)
+      end
     end
 
-    def send_log_cloud(file_name, parameter)
+    def send_log_cloud(file_name, parameter, is_show_log)
       if file_name == nil
         return
       end
@@ -59,8 +60,7 @@ module BigKeeper
       req = Net::HTTP::Post.new(uri.path, header)
       req.body = parameter.to_json
       res = https.request(req)
-
-      Logger.highlight("Send LeanCloud success, response #{res.body}")
+      Logger.highlight("Send LeanCloud success, response #{res.body}") unless !is_show_log
     end
 
     def assemble_request

data/lib/big_keeper/version.rb

@@ -1,3 +1,3 @@
 module BigKeeper
-  VERSION = "0.9.6"
+  VERSION = "0.9.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bigkeeper
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - mmoaay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-16 00:00:00.000000000 Z
+date: 2019-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -154,16 +154,16 @@ dependencies:
   name: big_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: cocoapods
   requirement: !ruby/object:Gem::Requirement
@@ -341,8 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Efficiency improvement for iOS&Android modular development.