flight_plan_cli 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78181ba943356a2938c0b17c0ebcb72ee0aa5d04
-  data.tar.gz: fe51626d77304f08f7b736b706a8cfbc7efd0a87
+  metadata.gz: d4b7888cb0ed509d5dc14e48c856f67c929c3a68
+  data.tar.gz: af5a01246e6979e28eda904000280d796ecd9f6b
 SHA512:
-  metadata.gz: 8667298164e296c2dfc04126bce4b0fb5ef23a19ce031cf52e2c770d6915b81d6f5c4c472c1d52be1a376ed910aa487e1e7a53c62fe5e932bb9e1be93e067269
-  data.tar.gz: d497fcceda6ddd0dbb3efad73a174c986fe16ea8e44c2bfd82936ac994c1153e4fb7b0406ea3e40ec411464b74adba408d3f0a9ec53e11821f41dacecf2a3f56
+  metadata.gz: 12efa16013e4409e369a63a21049edd4298c74914ea3e7bff8b90eb918b1507ac1db407f80ffbd8ac9dc72a996a1cd9a9ab35b64d4b9253e6637e1c881f01d53
+  data.tar.gz: c6e89e95945b59f862eae6c5f63db34405a88c450cd1b66c01a86031b207972f6ad716902e21d45a57e5cf58b9e467300ce91472f1efaa44016d15c462c87052

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/flight_plan_cli/initializer.rb

@@ -32,7 +32,9 @@ module FlightPlanCli
     desc 'checkout ISSUE_NO', 'checkout a branch for ISSUE_NO'
     def checkout(issue_no)
       puts "Checking out branch for #{issue_no}"
-      local_branch_for(issue_no) || remote_branch_for(issuei_no)
+      local_branch_for(issue_no) || remote_branch_for(issue_no)
+    rescue Rugged::CheckoutError => e
+      puts "Unable to checkout: #{e.message}".red
     end
 
     map co: :checkout
@@ -53,7 +55,7 @@ module FlightPlanCli
     end
 
     def local_branch_for(issue)
-      issue_branches = local_branches.grep(/##{issue}[^0-9]/)
+      issue_branches = local_branches.map(&:name).grep(/##{issue}[^0-9]/)
       return false unless issue_branches.count == 1
 
       branch = issue_branches.first
@@ -62,23 +64,28 @@ module FlightPlanCli
       true
     end
 
+    def remote_branch_for(issue)
+      git.fetch('origin')
+      issue_branches = remote_branches.map(&:name).grep(/##{issue}[^0-9]/)
+      return false unless issue_branches.count == 1
+
+      remote_branch_name = issue_branches.first
+      branch = remote_branches.find { |rb| rb.name == remote_branch_name }
+      local_name = branch.name[branch.remote_name.size + 1..-1]
+
+      puts "Checking out and tracking remote branch '#{local_name}'".green
+      new_branch = git.branches.create(local_name, branch.name)
+      new_branch.upstream = branch
+      git.checkout(local_name)
+      true
+    end
+
     def local_branches
-      @local_branches ||= git.branches.each(:local).map(&:name)
+      @local_branches ||= git.branches.each(:local)
     end
 
-    def remote_branch_for(issue)
-      git.fetch('origin')
-      return
-      git.branches.each(:remote) do |branch|
-        local_name = branch.name[branch.remote_name.size+1..-1]
-        next unless local_name.start_with? "feature/##{issue}-"
-        puts "Checking out and tracking remote branch '#{local_name}'".green
-        new_branch = git.branches.create(local_name, branch.name)
-        new_branch.upstream = branch
-        git.checkout(local_name)
-        return true
-      end
-      false
+    def remote_branches
+      @remote_branches ||= git.branches.each(:remote)
     end
 
     def git

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flight_plan_cli
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - John Cleary