big_keeper 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b396b98833d0bbe44d9345410e70963209fcb7b
-  data.tar.gz: 956e4effcef9a81e3c3e9eb062882f2b12ea0a5f
+  metadata.gz: 614030e993375adb543b94c896f0a9c140e1aeb7
+  data.tar.gz: ee9dae88f9b0f8057907240b11a0bc4d74cd1a43
 SHA512:
-  metadata.gz: 0ed9db1e01734561b65d052fb2fbfab216e2c26753ef3d37374ebf0995da3ffe3bc6b6ed2e2642f94bea25ac0217fdae0d7d873429eae6993af58f0e2e85d536
-  data.tar.gz: 468006350087e7a75dbf23dbb1edd94db6beae239d4a8e62cb031afd9011ec0b2e5fa17b02771aa4018e1e3244b1867cafd24f1f2486b469834f675f94f32418
+  metadata.gz: 1e407a4b7fcdc8c12247476dca57d04df0bf159d66d360235d06f45870e877b6c525c8730327e57f64063335c8904e29b59b2ff8f72e3d7f8c7f39db8f3e50b4
+  data.tar.gz: 567f52bb566f129a5bd6e232d3c1269a3b18df5afeb7c3f7f0ff994950ec22ab06b618a848c2a4a0168cee0e28793a720bf23c40f353133781ea9829b6fb12f6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    big_keeper (0.1.0)
+    big_keeper (0.2.0)
 
 GEM
   remote: https://ruby.taobao.org/

data/lib/big_keeper/command/feature_finish.rb

@@ -26,7 +26,7 @@ module BigKeeper
       BigkeeperParser.module_names.each do |module_name|
         module_git = BigkeeperParser.module_git(module_name)
         PodfileOperator.new.find_and_replace("#{path}/Podfile",
-                                             %Q('#{module_name}'),
+                                             module_name,
                                              ModuleType::GIT,
                                              GitInfo.new(module_git, GitType::BRANCH, 'develop'))
       end

data/lib/big_keeper/command/feature_start.rb

@@ -38,6 +38,11 @@ module BigKeeper
       end
 
       # Start home feature
+      GitOperator.new.git_checkout(path, 'master') if GitOperator.new.has_remote_branch(path, 'master')
+      GitOperator.new.git_checkout(path, 'develop') if GitOperator.new.has_remote_branch(path, 'develop')
+
+      GitOperator.new.pull(path, 'develop') if GitOperator.new.has_remote_branch(path, 'develop')
+
       GitflowOperator.new.start(path, feature_name, GitflowType::FEATURE)
 
       # Modify podfile as path and Start modules feature
@@ -53,7 +58,7 @@ module BigKeeper
       GitOperator.new.push(path, branch_name)
 
       # Open home workspace
-      p `open #{path}/*.xcworkspace`
+      `open #{path}/*.xcworkspace`
     ensure
     end
   end

data/lib/big_keeper/command/feature_switch.rb

@@ -36,7 +36,7 @@ module BigKeeper
       p `pod install --project-directory=#{path}`
 
       # Open home workspace
-      p `open #{path}/*.xcworkspace`
+      `open #{path}/*.xcworkspace`
     ensure
     end
   end

data/lib/big_keeper/command/feature_update.rb

@@ -52,7 +52,7 @@ module BigKeeper
         p `pod install --project-directory=#{path}`
 
         # Open home workspace
-        p `open #{path}/*.xcworkspace`
+        `open #{path}/*.xcworkspace`
       end
     ensure
     end

data/lib/big_keeper/service/module_service.rb

@@ -45,7 +45,7 @@ module BigKeeper
       branch_name = GitOperator.new.current_branch(module_full_path)
 
       PodfileOperator.new.find_and_replace("#{path}/Podfile",
-                                           %Q('#{module_name}'),
+                                           module_name,
                                            ModuleType::GIT,
                                            GitInfo.new(module_git, GitType::BRANCH, branch_name))
 
@@ -58,6 +58,16 @@ module BigKeeper
       branch_name = "#{GitflowType.name(type)}/#{name}"
       module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
 
+      if !File.exist? module_full_path
+        module_git = BigkeeperParser.module_git(module_name)
+        GitOperator.new.clone(File.expand_path("#{module_full_path}/../"), module_git)
+      end
+
+      GitOperator.new.git_checkout(module_full_path, 'master') if GitOperator.new.has_remote_branch(module_full_path, 'master')
+      GitOperator.new.git_checkout(module_full_path, 'develop') if GitOperator.new.has_remote_branch(module_full_path, 'develop')
+
+      GitOperator.new.pull(module_full_path, 'develop') if GitOperator.new.has_remote_branch(module_full_path, 'develop')
+
       GitflowOperator.new.start(module_full_path, name, type)
       GitOperator.new.push(module_full_path, branch_name)
 
@@ -65,7 +75,7 @@ module BigKeeper
 
       module_path = BigkeeperParser.module_path(user, module_name)
       PodfileOperator.new.find_and_replace("#{path}/Podfile",
-                                           %('#{module_name}'),
+                                           module_name,
                                            ModuleType::PATH,
                                            module_path)
     end
@@ -82,7 +92,7 @@ module BigKeeper
       module_git = BigkeeperParser.module_git(module_name)
 
       PodfileOperator.new.find_and_replace("#{path}/Podfile",
-                                           %Q('#{module_name}'),
+                                           module_name,
                                            ModuleType::GIT,
                                            GitInfo.new(module_git, GitType::BRANCH, 'develop'))
     end

data/lib/big_keeper/util/git_operator.rb

@@ -7,6 +7,16 @@ module BigKeeper
       end
     end
 
+    def has_remote_branch(path, branch_name)
+      has_branch = false
+      IO.popen("cd #{path}; git branch -a") do |io|
+        io.each do |line|
+          has_branch = true if line =~ /remotes\/origin\/#{branch_name}/
+        end
+      end
+      has_branch
+    end
+
     def has_branch(path, branch_name)
       has_branch = false
       IO.popen("cd #{path}; git branch -a") do |io|

data/lib/big_keeper/util/gitflow_operator.rb

@@ -16,9 +16,10 @@ module BigKeeper
         clear_flag = 'Already initialized for gitflow'
         IO.popen('git flow init -d') do |io|
           io.each do |line|
-            unless line.include? clear_flag
-              `git push origin master`
-              `git push origin develop`
+            if !line.include? clear_flag
+              GitOperator.new.push(module_full_path, 'master') if !GitOperator.new.has_remote_branch(module_full_path, 'master')
+              GitOperator.new.push(module_full_path, 'develop') if !GitOperator.new.has_remote_branch(module_full_path, 'develop')
+              break
             end
           end
         end

data/lib/big_keeper/util/podfile_operator.rb

@@ -55,21 +55,21 @@ module BigKeeper
     def generate_module_config(module_name, module_type, source)
       module_config = ''
       if ModuleType::PATH == module_type
-        module_config = %Q(  pod #{module_name}, :path => '#{source}')
+        module_config = %Q(    pod '#{module_name}', :path => '#{source}')
       elsif ModuleType::GIT == module_type
         # puts source.base
         # puts source.addition
         if GitType::BRANCH == source.type
-          module_config = %Q(  pod '#{module_name}', :git => '#{source.base}', :branch => '#{source.addition}')
+          module_config = %Q(    pod '#{module_name}', :git => '#{source.base}', :branch => '#{source.addition}')
         elsif GitType::TAG == source.type
-          module_config = %Q(  pod '#{module_name}', :git => '#{source.base}', :tag => '#{source.addition}')
+          module_config = %Q(    pod '#{module_name}', :git => '#{source.base}', :tag => '#{source.addition}')
         elsif GitType::COMMIT == source.type
-          module_config = %Q(  pod '#{module_name}', :git => '#{source.base}', :commit => '#{source.addition}')
+          module_config = %Q(    pod '#{module_name}', :git => '#{source.base}', :commit => '#{source.addition}')
         else
-          module_config = %Q(  pod '#{module_name}', :git => '#{source.base}')
+          module_config = %Q(    pod '#{module_name}', :git => '#{source.base}')
         end
       else
-        module_config = %Q(  pod #{module_name}, '#{source}')
+        module_config = %Q(    pod '#{module_name}', '#{source}')
       end
       module_config
     end

data/lib/big_keeper/version.rb

@@ -1,3 +1,3 @@
 module BigKeeper
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: big_keeper
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - mmoaay