bigkeeper 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af5169e70a626a1706572fdf6393a3788165e10f
-  data.tar.gz: 11f54ee3aea3911d82d6a7bf8b0b40f6654b755b
+  metadata.gz: 984646f715b01935f0df1fc84d7bbab58ed75b4a
+  data.tar.gz: 202103da5bdd8813bafae83bb02a8f06102d8a05
 SHA512:
-  metadata.gz: f602f2a150a7fc70c1c11d923ca5f052b453a8cb08fd4f81c4ecb560210b7762e8e15af380c7d448e676c47155142363cfad5bef2857157390986139aa1744b4
-  data.tar.gz: 76e6f74558df7762c76907b23538798122c3817f2b8b842e4297db6ebde4bca17c457f4e767c4b7afac721df7e212df5c27defdae14dc5383a7e220b1d5d416f
+  metadata.gz: 0351cf5e60e4cd89e9e6ca803871593de5d74170525eec45226798030c6f30138693cf47449f77ab2f5ff69201ccc1a66f401055563afaf3a470492c9dce3cdd
+  data.tar.gz: f155c7d12a092fc9016ee9bca4466a3b7a31c33285e309f5adc9ee90bc85161cc41bb286c9d7bc720c62a17b587f8194e40738f5c830251fe175939fa2c472ea

data/Gemfile.lock

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

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/dependency/dep_gradle_operator.rb

@@ -9,20 +9,10 @@ module BigKeeper
 
     def backup
       GradleOperator.new(@path).backup
-      modules = ModuleCacheOperator.new(@path).all_path_modules
-      modules.each do |module_name|
-        module_full_path = BigkeeperParser.module_full_path(@path, @user, module_name)
-        GradleOperator.new(module_full_path).backup
-      end
     end
 
     def recover
       GradleOperator.new(@path).recover
-      modules = ModuleCacheOperator.new(@path).all_path_modules
-      modules.each do |module_name|
-        module_full_path = BigkeeperParser.module_full_path(@path, @user, module_name)
-        GradleOperator.new(module_full_path).recover
-      end
     end
 
     def update_module_config(module_name, module_operate_type)
@@ -52,7 +42,7 @@ module BigKeeper
     end
 
     def generate_version_config_of_line(line, module_name, module_operate_type)
-      if line.downcase.match(/([\s\S]*)#{module_name.downcase}version(\s*)=(\s*)('|")(\S*)('|")([\s\S]*)/)
+      if line.downcase.match(/([\s\S]*)#{module_name.downcase.gsub('-','')}version(\s*)=(\s*)('|")(\S*)('|")([\s\S]*)/)
         branch_name = GitOperator.new.current_branch(@path)
         version_name = ''
         # Get version part of source.addition
@@ -76,7 +66,7 @@ module BigKeeper
       origin_config = ''
       File.open("#{@path}/.bigkeeper/#{PATH_VERSION_CONFIG}", 'r') do |file|
         file.each_line do |line|
-          if line.downcase.match(/([\s\S]*)#{module_name.downcase}version(\s*)=(\s*)('|")(\S*)('|")([\s\S]*)/)
+          if line.downcase.match(/([\s\S]*)#{module_name.downcase.gsub('-','')}version(\s*)=(\s*)('|")(\S*)('|")([\s\S]*)/)
             origin_config = line
             break
           end

data/lib/big_keeper/util/gradle_operator.rb

@@ -15,13 +15,18 @@ module BigKeeper
       cache_operator.save(PATH_VERSION_CONFIG)
     end
 
-    def recover(settings_config, build_config)
+    def recover()
       cache_operator = CacheOperator.new(@path)
-      cache_operator.load(PATH_VERSION_CONFIG)
+      # cache_operator.load(PATH_VERSION_CONFIG)
       cache_operator.clean
     end
 
     def update_version_config(module_name, module_operate_type)
+      module_full_path = BigkeeperParser.module_full_path(@path, @user, module_name)
+      if module_operate_type == ModuleOperateType::ADD
+        GradleOperator.new(module_full_path).backup
+      end
+
       temp_file = Tempfile.new('.version-config.gradle.tmp')
       begin
         File.open("#{@path}/#{PATH_VERSION_CONFIG}", 'r') do |file|
@@ -39,10 +44,14 @@ module BigKeeper
         temp_file.close
         temp_file.unlink
       end
+
+      if module_operate_type == ModuleOperateType::PUBLISH
+        GradleOperator.new(module_full_path).recover
+      end
     end
 
     def generate_version_config_of_line(line, module_name, module_operate_type)
-      if line.downcase.match(/([\s\S]*)#{module_name.downcase}version(\s*)=(\s*)('|")(\S*)('|")([\s\S]*)/)
+      if line.downcase.match(/([\s\S]*)#{module_name.downcase.gsub('-','')}version(\s*)=(\s*)('|")(\S*)('|")([\s\S]*)/)
         branch_name = GitOperator.new.current_branch(@path)
         version_name = ''
 
@@ -63,7 +72,7 @@ module BigKeeper
       origin_config = ''
       File.open("#{@path}/.bigkeeper/#{PATH_VERSION_CONFIG}", 'r') do |file|
         file.each_line do |line|
-          if line.downcase.match(/([\s\S]*)#{module_name.downcase}version(\s*)=(\s*)('|")(\S*)('|")([\s\S]*)/)
+          if line.downcase.match(/([\s\S]*)#{module_name.downcase.gsub('-','')}version(\s*)=(\s*)('|")(\S*)('|")([\s\S]*)/)
             origin_config = line
             break
           end

data/lib/big_keeper/version.rb

@@ -1,3 +1,3 @@
 module BigKeeper
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bigkeeper
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - mmoaay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-15 00:00:00.000000000 Z
+date: 2019-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli