bigkeeper 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e35ab8c916429eae6491c920c562d0ab6fa0defd431e8c1b7a4db84381ecb2d
-  data.tar.gz: d0d89ee1e0a75c55dfb5fb0dd0429aada8a842e1c6f2505930eeb91f849aef84
+  metadata.gz: 212d55ed7b40a20cb064b7e44aec4d64f626f544cf58317a5e7282fdc6997c21
+  data.tar.gz: a70529b65ad54fab0c0095e72cfc4b99cfae34523ccf47dce639a704d5c12046
 SHA512:
-  metadata.gz: 5843c7b600a1ec3f917f2a24b498fada7f7b94f415bea94bbd3b08c11afe59902a1ec37e9310689cf546d5a49ddaa17914c226dbf6df09fa129d168a1f90d983
-  data.tar.gz: 991b6e47428b65ab45200abb60cd72314acc8f0ff710d102d1947a25d80b86e75837c4310c9a9199ec2f39f9643fc46dd02b763bb02c8f5001692414e20e8e74
+  metadata.gz: e3e6bd0cfe8f8addaa70d46481ee4e29ebae75f39e4fc7986d18ee566f2f7a1db5f1fd3d1599d6df9a3ed6512e9ba54cc8fb84ea5245fbf4ad5e5c7e68b8237b
+  data.tar.gz: 981001593e44d3bbf4e1e787c389c85f54816b9ae6e88ffaa433a84a37a73612a8234d64fcf0cf0ccad9d9a37b010827f666fb02f7ebc7bb0493463af25cfb67

data/Gemfile

@@ -8,3 +8,8 @@ gemspec
 group :test do
   gem 'rake'
 end
+
+if RUBY_VERSION =~ /1.9/
+  Encoding.default_external = Encoding::UTF_8
+  Encoding.default_internal = Encoding::UTF_8
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bigkeeper (0.9.7)
+    bigkeeper (0.9.9)
       big_resources
       big_stash (~> 0.1)
       cocoapods

data/lib/big_keeper.rb

@@ -40,12 +40,16 @@ module BigKeeper
     exit
   end
 
-  pre do |global_options,command,options,args|
+  pre do |global_options, command, options, args|
     LeanCloudLogger.instance.start_log(global_options, args)
   end
 
-  post do |global_options,command,options,args|
-    LeanCloudLogger.instance.end_log(true, global_options[:log] == "true")
+  post do |global_options, command, options, args|
+    is_show_log = true
+    if global_options[:log] == 'false'
+      is_show_log = false
+    end
+    LeanCloudLogger.instance.end_log(true, is_show_log)
   end
 
   feature_and_hotfix_command(GitflowType::FEATURE)

data/lib/big_keeper/util/bigkeeper_parser.rb

@@ -50,7 +50,7 @@ module BigKeeper
 
         Logger.error("Can't find a Bigkeeper file in current directory.") if !FileOperator.definitely_exists?(bigkeeper)
 
-        content = File.read bigkeeper
+        content = File.read(bigkeeper, :encoding => 'UTF-8')
         content.gsub!(/version\s/, 'BigKeeper::version ')
         content.gsub!(/user\s/, 'BigKeeper::user ')
         content.gsub!(/home\s/, 'BigKeeper::home ')

data/lib/big_keeper/util/cache_operator.rb

@@ -33,7 +33,7 @@ module BigKeeper
 
       if File.exist?("#{@cache_path}/module.cache")
         file = File.open("#{@cache_path}/module.cache", 'r')
-        @modules = JSON.load(file.read())
+        @modules = JSON.load(file.read(), :encoding => 'UTF-8')
         file.close
       else
         @modules = {"git" => {"all" => [], "current" => []}, "path" => {"all" => [], "add" => [], "del" => [], "current" => []}}

data/lib/big_keeper/util/leancloud_logger.rb

@@ -69,7 +69,10 @@ 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}") unless !is_show_log
+
+      if is_show_log == true
+        Logger.highlight("Send LeanCloud success, response #{res.body}")
+      end
     end
 
     def assemble_request

data/lib/big_keeper/util/list_generator.rb

@@ -6,7 +6,7 @@ module BigKeeper
     #generate tree print throught console
     def self.generate_tree(file_path, home_branches, version)
       module_branches_dic = {}
-      json_data = File.read(file_path)
+      json_data = File.read(file_path, :encoding => 'UTF-8')
       module_branches_dic = JSON.parse(json_data)
       to_tree(module_branches_dic, home_branches, version)
       File.delete(file_path)
@@ -15,7 +15,7 @@ module BigKeeper
       #generate json print throught console
     def self.generate_json(file_path, home_branches, version)
       module_branches_dic = {}
-      json_data = File.read(file_path)
+      json_data = File.read(file_path, :encoding => 'UTF-8')
       module_branches_dic = JSON.parse(json_data)
       json = to_json(home_branches, module_branches_dic, version)
       puts JSON.pretty_generate(json)

data/lib/big_keeper/util/lockfile_parser.rb

@@ -17,7 +17,7 @@ module BigKeeper
     def parse(main_path)
       self.main_path = main_path
       $mode = 'PODS'
-      podfile_lock_lines = File.readlines("#{main_path}/Podfile.lock")
+      podfile_lock_lines = File.readlines("#{main_path}/Podfile.lock", :encoding => 'UTF-8')
       Logger.highlight("Analyzing Podfile.lock...")
       podfile_lock_lines.each do |sentence|
         if sentence.include?('PODS')

data/lib/big_keeper/util/podfile_detector.rb

@@ -17,7 +17,7 @@ class PodfileParser
 
   def parse(path)
     @main_path = path
-    podfile_lines = File.readlines("#{@main_path}/Podfile")
+    podfile_lines = File.readlines("#{@main_path}/Podfile", :encoding => 'UTF-8')
     Logger.highlight("Analyzing Podfile...") unless podfile_lines.size.zero?
     podfile_lines.collect do |sentence|
       if /pod / =~ sentence
@@ -28,7 +28,7 @@ class PodfileParser
   end
 
   def get_unlock_pod_list
-    podfile_lines = File.readlines("#{@main_path}/Podfile")
+    podfile_lines = File.readlines("#{@main_path}/Podfile", :encoding => 'UTF-8')
     #Logger.highlight("Analyzing Podfile...") unless podfile_lines.size.zero?
     podfile_lines.collect do |sentence|
     deal_podfile_line(sentence) unless sentence =~(/'(\d+.){1,2}\d+'/)

data/lib/big_keeper/util/podfile_module.rb

@@ -37,7 +37,7 @@ class PodfileModuleDetector
   end
 
   def deal_module_info
-    podfile_lines = File.readlines("#{@main_path}/bigKeeperPodInfo.tmp")
+    podfile_lines = File.readlines("#{@main_path}/bigKeeperPodInfo.tmp", :encoding => 'UTF-8')
     Logger.highlight("Analyzing modules info...") unless podfile_lines.size.zero?
       podfile_lines.collect do |sentence|
         if sentence =~(/pod/)

data/lib/big_keeper/version.rb

@@ -1,3 +1,3 @@
 module BigKeeper
-  VERSION = "0.9.8"
+  VERSION = "0.9.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bigkeeper
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - mmoaay