zio 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4db5f02cc89e272c47f92ed989bd5022c35d0b0
-  data.tar.gz: 0ad2c4f329303b13f0fa91ea8f5d94bad7e62fbb
+  metadata.gz: a93f4288caee353d34b787a2077bace1b9885dc2
+  data.tar.gz: 91b97e0fbe382587ba3e131bfc108f3876b757be
 SHA512:
-  metadata.gz: 36d18b74216ee9d0e74084f4017d1b8daf0296b053287fdbd4d8adbabe973674e81b02974fb2dc99319c865c4534c74c1c06aeeeda7d618f4ae07d1a412ba122
-  data.tar.gz: 7826856fc69910ce3cfea1309396c74eafb63ef5f816a40a24faed9b79751763bce53daf519a84d2969eaaf705e4ed3f024b52eb519be864e63bf73d1e821cb4
+  metadata.gz: 9cf83ec05062adc6d080d8f7bf8bc17f1956c4b638b6a66e6352ee474e5c1cfbd6d9990c86acd1d003dcf35a6f9bb982e63411e26b809cb1f4bccb22baefcd11
+  data.tar.gz: 645fe7cc8606e9acbda08f5efdca9773b630e3ff46cead41e751bb509e6cebb9b363263db49170c5e5e87d01ca246c5d47b5da5f5679e6752426bb5bcbfbe457

data/bin/zio

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 require 'gli'
 require 'zio/up'
+require 'zio/branch'
 
 begin # XXX: Remove this begin/rescue before distributing your app
   require 'zio'
@@ -13,47 +14,51 @@ end
 
 include GLI::App
 
-program_desc 'Describe your application here'
+program_desc 'Bella zio! Productivity tools'
 
 version Zio::VERSION
 
 subcommand_option_handling :normal
 arguments :strict
 
-# desc 'Describe some switch here'
-# switch [:s,:switch]
-#
-# desc 'Describe some flag here'
-# default_value 'the default'
-# arg_name 'The name of the argument'
-# flag [:f,:flagname]
-
-desc 'Run stash and git pull --rebase on git repos'
+desc 'Stash and pull --rebase on master'
 command :up do |c|
-  c.desc 'Dir path'
-  c.default_value File.expand_path('~/')
-  c.flag :d
-
-  c.desc 'Dirs set'
-  c.flag :s
+  c.desc 'Parent directory to scan. Apply to any contained git repo'
+  c.flag [:d, :directory]
 
-  dirsets = YAML.load_file(File.join(ENV['HOME'],'.zio.rc.yml'))[:dirsets]
+  c.desc 'Git repos set'
+  c.flag [:s, :repos_set]
 
   c.action do |_global_options, options, _args|
-     logger = Zio::UpLogger.new
-     opts = { dir: options[:d] }
-     opts[:set] = dirsets[options[:s]] if options[:s]
-     Zio::Up.new(opts).up
-     logger.print
+    logger = Zio::UpLogger.new
+    opts = { dir: options[:d] }
+    opts[:set] = $dirsets[options[:s]] if options[:s]
+    Zio::Up.new(opts).up
+    logger.print
   end
-
 end
 
-desc 'Describe checkout here'
-arg_name 'Describe arguments to checkout here'
-command :checkout do |c|
-  c.action do |_global_options, _options, _args|
-    puts 'checkout command ran'
+desc 'Branch checkout'
+arg_name 'branch_name'
+command :branch do |c|
+  c.desc 'Parent directory to scan. Apply to any contained git repo'
+  c.flag [:d, :directory]
+
+  c.desc 'Git repos set'
+  c.flag [:s, :repos_set]
+
+  c.desc 'Create the branch if does not exists'
+  c.switch [:f, :force]
+
+  c.desc 'If -f the base branch to checkout from'
+  c.default_value 'master'
+  c.flag [:b, :base_branch]
+
+  c.action do |_global_options, options, args|
+    branch = args[0] || 'master'
+    opts = { dir: options[:d], branch: branch, force: options[:f], base_branch: options[:b] }
+    opts[:set] = $dirsets[options[:s]] if options[:s]
+    Zio::Branch.new(opts).checkout
   end
 end
 
@@ -63,6 +68,7 @@ pre do |_global, _command, _options, _args|
   # chosen command
   # Use skips_pre before a command to skip this block
   # on that command only
+  $dirsets = YAML.load_file(File.join(ENV['HOME'], '.zio.rc.yml'))[:dirsets]
   true
 end
 

data/lib/zio/branch.rb

@@ -0,0 +1,45 @@
+require 'open3'
+
+module Zio
+  class Branch
+    attr_accessor :options
+    def initialize(options={})
+      @options = options
+      raise MISSING_ARGUMENTS unless options[:dir] || options[:set]
+    end
+
+    def checkout
+      _paths.each do |path|
+        #self.class.new(options).async.pull(path)
+        puts path
+        stdout, stderr, status = Open3.capture3("cd #{path} && git stash && git rev-parse --verify #{options[:branch]}")
+
+        # Branch does not exists
+        if status.exitstatus != 0 && options[:force]
+          stdout, stderr, status = Open3.capture3(
+              "cd #{path} && git checkout #{options[:base_branch]} && git checkout -b #{options[:branch]}"
+          )
+        else
+          stdout, stderr, status = Open3.capture3("cd #{path} && git checkout #{options[:branch]}")
+        end
+      end
+
+    end
+
+    def pull(path)
+      stdout, stderr, status = Open3.capture3("cd #{path} && git stash && git checkout master && git pull --rebase")
+      publish 'up_capture_complete', [path, stdout, stderr, status]
+    end
+
+    def _paths
+      return options[:set] unless options[:set].nil?
+      @_paths ||= begin
+        Dir.foreach(options[:dir]).map do |path|
+          next if path == '.' || path == '..' || !File.exists?(File.expand_path(path, options[:dir]) + '/.git')
+          ab_path = File.expand_path(path, options[:dir])
+          File.directory?(ab_path) ? ab_path : nil
+        end.compact
+      end
+    end
+  end
+end

data/lib/zio/version.rb

@@ -1,3 +1,3 @@
 module Zio
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zio
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Your Name Here
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -114,6 +114,7 @@ files:
 - features/support/env.rb
 - features/zio.feature
 - lib/zio.rb
+- lib/zio/branch.rb
 - lib/zio/exceptions.rb
 - lib/zio/up.rb
 - lib/zio/version.rb