flight_plan_cli 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1143966ef8166114dfc708a3937c2e38a20b4b62
-  data.tar.gz: edd59507ccd883c018980e8a03223405667aa611
+  metadata.gz: 3f8285ccf8079adbe2b1eb0395c8ff767df3183f
+  data.tar.gz: 98a454fb40337e4155a5c8b958e8ab64032a6c79
 SHA512:
-  metadata.gz: 3c15ad4a8fb00306867f8754cc192928b59aea5e830ab70c3f190034d7ab9352e29ba3c2f255879d659ae12eedad8b2560483f8e61df3ad8494c86c66f4d9af0
-  data.tar.gz: 281f06bbe0d4d961c0f7c96b0b2f29de7c2778fbd256306fac0795bd3d80828522624c174b41b53f5fe15a96e08afaf132e32d9317c981a32e072f1390a85654
+  metadata.gz: 651f743ff125ef6241c60f1626cf58311341c93678ce55e6a5882b749a86ae629c703b53c40ac9eaa310938a3b6838cf2da95d02cc86fb7d3676e00d4f4282c2
+  data.tar.gz: 3689605b90a4df412a3f3950256dac6f4fda9771a0b18f7b32774f29a984fbfc45c8eadc876589aa84b2d71e2d29c1d85eba6489db813c330aa9ed06add49138

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.8

data/lib/flight_plan_cli/commands/checkout.rb

@@ -86,8 +86,8 @@ module FlightPlanCli
       def credentials
         @ssh_agent ||= Rugged::Credentials::SshKey.new(
           username: 'git',
-          publickey: File.expand_path('~/.ssh/id_rsa.pub'),
-          privatekey: File.expand_path('~/.ssh/id_rsa')
+          publickey: File.expand_path(ssh_public_key),
+          privatekey: File.expand_path(ssh_private_key)
         )
       end
     end

data/lib/flight_plan_cli/commands/{ls.rb → list.rb}

@@ -1,10 +1,11 @@
 module FlightPlanCli
   module Commands
-    class Ls
+    class List
       module Color
         SWIMLANE = :cyan
         ISSUE = :yellow
-        ISSUE_NO = :red
+        ISSUE_NO = :light_red
+        CHECKED_OUT_BACKGROUND = :light_black
       end
 
       include FlightPlanCli::Config
@@ -51,13 +52,20 @@ module FlightPlanCli
           .colorize(Color::SWIMLANE)
 
         swimlane['tickets'].each do |ticket|
-          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)
+          print_ticket(ticket)
         end
         puts
       end
+
+      def print_ticket(ticket)
+        checked_out = git.head.name =~ /##{ticket['remote_number']}[^0-9]/
+        line =
+          "  #{ticket['remote_number']}".colorize(Color::ISSUE_NO) +
+          " #{ticket['remote_title']} ".colorize(Color::ISSUE)
+        line = line.colorize(background: Color::CHECKED_OUT_BACKGROUND) if checked_out
+
+        puts line
+      end
     end
   end
 end

data/lib/flight_plan_cli/config.rb

@@ -17,6 +17,14 @@ module FlightPlanCli
       @api_secret = ENV['FLIGHT_PLAN_API_SECRET']
     end
 
+    def ssh_private_key
+      ENV['GIT_SSH_PRIVATE_KEY'] || '~/.ssh/id_rsa'
+    end
+
+    def ssh_public_key
+      ENV['GIT_SSH_PUBLIC_KEY'] || '~/.ssh/id_rsa.pub'
+    end
+
     def client
       @client ||= FlightPlanCli::Api.new(
         url: api_url,

data/lib/flight_plan_cli/initializer.rb

@@ -16,7 +16,7 @@ module FlightPlanCli
 
     desc 'ls', 'List open issues'
     def ls
-      Commands::Ls.new.process
+      Commands::List.new.process
     end
 
     desc 'checkout ISSUE_NO', 'checkout a branch for ISSUE_NO'

data/lib/flight_plan_cli.rb

@@ -1,6 +1,6 @@
 require 'dotenv/load'
 require 'flight_plan_cli/config'
-require 'flight_plan_cli/commands/ls'
+require 'flight_plan_cli/commands/list'
 require 'flight_plan_cli/commands/checkout'
 require 'flight_plan_cli/initializer'
 require 'flight_plan_cli/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flight_plan_cli
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - John Cleary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-31 00:00:00.000000000 Z
+date: 2018-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -191,7 +191,7 @@ files:
 - lib/flight_plan_cli.rb
 - lib/flight_plan_cli/api.rb
 - lib/flight_plan_cli/commands/checkout.rb
-- lib/flight_plan_cli/commands/ls.rb
+- lib/flight_plan_cli/commands/list.rb
 - lib/flight_plan_cli/config.rb
 - lib/flight_plan_cli/initializer.rb
 - lib/flight_plan_cli/version.rb