flight_plan_cli 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a483a30bc314a4e2f8664d2549dcd6220c4143f
-  data.tar.gz: ea127beb180f262c57314c936c186971a5f68421
+  metadata.gz: 1143966ef8166114dfc708a3937c2e38a20b4b62
+  data.tar.gz: edd59507ccd883c018980e8a03223405667aa611
 SHA512:
-  metadata.gz: 6fc14dc2d8df9b844439f0d70e2dfd7de05c09cc446fc6c5b272b32937383da00580cfbddd57487842dc18079df5bdc73bf4f2e249d8d0f547eeaae93f6953f1
-  data.tar.gz: 130b6b32dd15e2f8007186aacb9353bea866f8dbe3493523decaf0d419060b61e9b7a15392ed8111623e6cc9f63db7063f67b38686793f6f4b50e5272baf7bba
+  metadata.gz: 3c15ad4a8fb00306867f8754cc192928b59aea5e830ab70c3f190034d7ab9352e29ba3c2f255879d659ae12eedad8b2560483f8e61df3ad8494c86c66f4d9af0
+  data.tar.gz: 281f06bbe0d4d961c0f7c96b0b2f29de7c2778fbd256306fac0795bd3d80828522624c174b41b53f5fe15a96e08afaf132e32d9317c981a32e072f1390a85654

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/lib/flight_plan_cli/api.rb

@@ -2,18 +2,21 @@ require 'httparty'
 
 module FlightPlanCli
   class Api
-    def initialize(url:, key:, secret:)
+
+    def initialize(url:, key:, secret:, board_id: nil, repo_id: nil)
       @url = url
       @key = key
       @secret = secret
+      @board_id = board_id
+      @repo_id = repo_id
     end
 
-    def board_tickets(board_id: nil, repo_id: nil, repo_url: nil, assignee_username: nil)
+    def board_tickets(assignee_username: nil, remote_number: nil)
       params = {
         board_id: board_id,
         repo_id: repo_id,
-        repo_url: repo_url,
-        assignee_username: assignee_username
+        assignee_username: assignee_username,
+        remote_number: remote_number
       }
 
       HTTParty.get("#{url}/board_tickets.json", query: params, headers: headers)
@@ -22,6 +25,7 @@ module FlightPlanCli
     private
 
     attr_reader :url, :key, :secret
+    attr_reader :board_id, :repo_id
 
     def headers
       @headers = {

data/lib/flight_plan_cli/commands/checkout.rb

@@ -1,15 +1,19 @@
 module FlightPlanCli
   module Commands
     class Checkout
-      def process(issue_no)
-        puts "Checking out branch for #{issue_no}"
-        local_branch_for(issue_no) ||
-          remote_branch_for(issue_no) ||
-          new_branch_for(issue_no)
+      include FlightPlanCli::Config
+
+      def process(issue)
+        puts "Checking out branch for #{issue}"
+        local_branch_for(issue) ||
+          remote_branch_for(issue) ||
+          new_branch_for(issue)
       rescue Rugged::CheckoutError => e
         puts "Unable to checkout: #{e.message}".red
       end
 
+      private
+
       def local_branch_for(issue)
         issue_branches = local_branches.map(&:name).grep(/##{issue}[^0-9]/)
         return false unless issue_branches.count == 1
@@ -21,19 +25,45 @@ module FlightPlanCli
       end
 
       def remote_branch_for(issue)
-        fetch
         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
+        puts "Checking out and tracking remote branch '#{branch.name}'".green
+        checkout_locally(branch)
+        true
+      end
+
+      def checkout_locally(branch)
+        local_name = branch.name[branch.remote_name.size + 1..-1]
         new_branch = git.branches.create(local_name, branch.name)
         new_branch.upstream = branch
         git.checkout(local_name)
-        true
+      end
+
+      def new_branch_for(issue)
+        read_config
+        branches = client.board_tickets(remote_number: issue)
+        # TODO: update flight_plan to only return one issue when remote_numer is provided
+        branches = branches.select { |b| b['ticket']['remote_number'] == issue }
+        return false unless branches.count == 1
+
+        branch_name = branch_name(branches.first)
+
+        puts "Creating new branch #{branch_name} from master".green
+
+        git.branches.create(branch_name, 'origin/master')
+        git.checkout(branch_name)
+      end
+
+      def branch_name(branch)
+        "feature/##{branch['ticket']['remote_number']}-" +
+          branch['ticket']['remote_title']
+          .gsub(/[^a-z0-9\s]/i, '')
+          .tr(' ', '-')
+          .downcase
       end
 
       def local_branches
@@ -41,11 +71,11 @@ module FlightPlanCli
       end
 
       def remote_branches
-        @remote_branches ||= git.branches.each(:remote)
-      end
-
-      def git
-        @git ||= Rugged::Repository.new(Dir.pwd)
+        @remote_branches ||=
+          begin
+            fetch
+            git.branches.each(:remote)
+          end
       end
 
       def fetch

data/lib/flight_plan_cli/commands/ls.rb

@@ -1,6 +1,12 @@
 module FlightPlanCli
   module Commands
     class Ls
+      module Color
+        SWIMLANE = :cyan
+        ISSUE = :yellow
+        ISSUE_NO = :red
+      end
+
       include FlightPlanCli::Config
 
       def initialize
@@ -21,9 +27,10 @@ module FlightPlanCli
         puts "Network error. #{e.message}".red
       end
 
+      private
+
       def tickets_by_swimlane
-        response = client.board_tickets(board_id: board_id, repo_id: repo_id)
-        puts 'ok2'
+        response = client.board_tickets
         raise ApiUnauthorized if response.code == 401
         raise ApiNotFound if response.code == 404
 
@@ -40,10 +47,16 @@ module FlightPlanCli
       end
 
       def print_swimlane(swimlane)
-        puts "#{swimlane['name']} (#{swimlane['tickets'].count})".green
+        puts "#{swimlane['name']} (#{swimlane['tickets'].count})"
+          .colorize(Color::SWIMLANE)
+
         swimlane['tickets'].each do |ticket|
-          puts "├── #{ticket['remote_number'].rjust(4)} : #{ticket['remote_title']}".yellow
+          title = ticket['remote_title']
+          title = title.underline if git.head.name =~ /##{ticket['remote_number']}[^0-9]/
+          print "  #{ticket['remote_number']} ".colorize(Color::ISSUE_NO)
+          puts title.colorize(Color::ISSUE)
         end
+        puts
       end
     end
   end

data/lib/flight_plan_cli/config.rb

@@ -1,5 +1,7 @@
 module FlightPlanCli
   module Config
+    private
+
     YAML_FILE = '.flight_plan_cli.yml'.freeze
 
     attr_reader :board_id, :repo_id, :default_swimlane_ids
@@ -19,10 +21,16 @@ module FlightPlanCli
       @client ||= FlightPlanCli::Api.new(
         url: api_url,
         key: api_key,
-        secret: api_secret
+        secret: api_secret,
+        board_id: board_id,
+        repo_id: repo_id
       )
     end
 
+    def git
+      @git ||= Rugged::Repository.new(Dir.pwd)
+    end
+
     def config
       @config ||=
         begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flight_plan_cli
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - John Cleary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2018-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler