flight_plan_cli 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f8285ccf8079adbe2b1eb0395c8ff767df3183f
-  data.tar.gz: 98a454fb40337e4155a5c8b958e8ab64032a6c79
+  metadata.gz: e0ebce73bfea260b7392497254675b169fcb33da
+  data.tar.gz: f17af525e05d38c4a919d82da156746197ac80ad
 SHA512:
-  metadata.gz: 651f743ff125ef6241c60f1626cf58311341c93678ce55e6a5882b749a86ae629c703b53c40ac9eaa310938a3b6838cf2da95d02cc86fb7d3676e00d4f4282c2
-  data.tar.gz: 3689605b90a4df412a3f3950256dac6f4fda9771a0b18f7b32774f29a984fbfc45c8eadc876589aa84b2d71e2d29c1d85eba6489db813c330aa9ed06add49138
+  metadata.gz: 28d5363acaf5bee2074df36cdef49f92701f494100b4d4c05a557b28a76508a262d0d759df88ee7d833b0aeb79e1a35dfcb67fda34aa06fed8678fbd396553cc
+  data.tar.gz: d4a7657d74297efa2a8425168ba3b62e331de6c3a954fbd389e09ef0f32e0d3163d8b768b68f2f8ab297d2bbb63532771672f9b74ece6484a8582b1a139426c9

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.3.0

data/lib/flight_plan_cli/commands/checkout.rb

@@ -3,6 +3,10 @@ module FlightPlanCli
     class Checkout
       include FlightPlanCli::Config
 
+      def initialize
+        read_config
+      end
+
       def process(issue)
         puts "Checking out branch for #{issue}"
         local_branch_for(issue) ||
@@ -44,7 +48,6 @@ module FlightPlanCli
       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 }
@@ -86,8 +89,8 @@ module FlightPlanCli
       def credentials
         @ssh_agent ||= Rugged::Credentials::SshKey.new(
           username: 'git',
-          publickey: File.expand_path(ssh_public_key),
-          privatekey: File.expand_path(ssh_private_key)
+          publickey: File.expand_path(git_ssh_public_key),
+          privatekey: File.expand_path(git_ssh_private_key)
         )
       end
     end

data/lib/flight_plan_cli/config.rb

@@ -2,10 +2,12 @@ module FlightPlanCli
   module Config
     private
 
-    YAML_FILE = '.flight_plan_cli.yml'.freeze
+    CONFIG_YAML_PATH = '.flight_plan_cli/config.yml'.freeze
+    USER_YAML_PATH = '.flight_plan_cli/user.yml'.freeze
 
     attr_reader :board_id, :repo_id, :default_swimlane_ids
     attr_reader :api_url, :api_key, :api_secret
+    attr_reader :git_ssh_public_key, :git_ssh_private_key
 
     def read_config
       @board_id = config['board_id']
@@ -13,16 +15,10 @@ module FlightPlanCli
       @default_swimlane_ids = config['ls']['default_swimlane_ids']
 
       @api_url = config['api_url']
-      @api_key = ENV['FLIGHT_PLAN_API_KEY']
-      @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'
+      @api_key = config['flight_plan_api_key']
+      @api_secret = config['flight_plan_api_secret']
+      @git_ssh_private_key = config['git_ssh_private_key'] || '~/.ssh/id_rsa'
+      @git_ssh_public_key = config['git_ssh_public_key'] || '~/.ssh/id_rsa.pub'
     end
 
     def client
@@ -42,12 +38,17 @@ module FlightPlanCli
     def config
       @config ||=
         begin
-          unless File.exist?(YAML_FILE)
-            puts "Could not file #{YAML_FILE} file."
-            exit 1
-          end
-          YAML.load_file(YAML_FILE)
+          check_config_exists
+          YAML.load_file(CONFIG_YAML_PATH).merge(
+            FileTest.exist?(USER_YAML_PATH) ? YAML.load_file(USER_YAML_PATH) : {}
+          )
         end
     end
+
+    def check_config_exists
+      return if FileTest.exist?(CONFIG_YAML_PATH)
+      puts "#{CONFIG_YAML_PATH} not found"
+      exit 1
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flight_plan_cli
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - John Cleary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-09 00:00:00.000000000 Z
+date: 2018-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler