flight_plan_cli 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c6ff4e9c6395e03790bb5865270d88c4880d3ec
-  data.tar.gz: d47443d71c83c7ae068942b128ab457d2661cb08
+  metadata.gz: 333ada2e946b4a88e03817a17f8af707311533fb
+  data.tar.gz: ed3606ebc99f0ea80b8937860964251ae7f439d0
 SHA512:
-  metadata.gz: f6554aaf832eabdcd397d04027257b5b1fc23cfa57b1173ea7a171515278e50aea266ba711d7d7aa463433ab0afe071038283dc9c0a4b46c27601329715d5b4a
-  data.tar.gz: cfdb6032a1ab59fe06c2b3aa5b53eb049c0d13db16247cc02c77711838d10fa112e18328db1952d26b45a41a98e1e80ae1c9eebebe0f35e5dc85647e360c258b
+  metadata.gz: e89c55f15768ea01d9a0788b858b58787c5ee0ea2efdd239f718ae40397c4d2958aee1573dabb9b35b2b93739ce43da6b84707d0d1280f3711726fc632512e63
+  data.tar.gz: 13cbb1a2bd9ea7701c11a4945e6073774d662efd9cde4e90356dbbbc098abf659d4bf95ed7c4fee0c6b9fef9a892a8ecff3ab03f929ab13086a3ecf691500032

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/lib/flight_plan_cli/api.rb

@@ -2,7 +2,6 @@ require 'httparty'
 
 module FlightPlanCli
   class Api
-
     def initialize(url:, key:, secret:, board_id: nil, repo_id: nil)
       @url = url
       @key = key

data/lib/flight_plan_cli/clients/flight_plan.rb

@@ -0,0 +1,15 @@
+module FlightPlanCli
+  module Clients
+    module FlightPlan
+      def flight_plan
+        @flight_plan ||= FlightPlanCli::Api.new(
+          url: FlightPlanCli::Settings.api_url,
+          key: FlightPlanCli::Settings.api_key,
+          secret: FlightPlanCli::Settings.api_secret,
+          board_id: FlightPlanCli::Settings.board_id,
+          repo_id: FlightPlanCli::Settings.repo_id
+        )
+      end
+    end
+  end
+end

data/lib/flight_plan_cli/clients/git.rb

@@ -0,0 +1,9 @@
+module FlightPlanCli
+  module Clients
+    module Git
+      def git
+        @git ||= ::Git.open(Dir.pwd)
+      end
+    end
+  end
+end

data/lib/flight_plan_cli/commands/checkout.rb

@@ -1,12 +1,12 @@
 module FlightPlanCli
   module Commands
     class Checkout
-      include FlightPlanCli::Config
+      include FlightPlanCli::Clients::Git
+      include FlightPlanCli::Clients::FlightPlan
 
       def initialize(issue_no)
         @issue_no = issue_no
         @fetched = false
-        read_config
       end
 
       def process
@@ -43,14 +43,14 @@ module FlightPlanCli
       end
 
       def new_branch_for_issue
-        git.checkout('master')
-        git.pull
-        branches = client.board_tickets(remote_number: issue_no)
+        branches = flight_plan.board_tickets(remote_number: issue_no)
         # TODO: update flight_plan to only return one issue when remote_numer is provided
         branches = branches.select { |b| b['ticket']['remote_number'] == issue_no }
         return false unless branches.count == 1
 
         branch_name = branch_name(branches.first)
+        git.checkout('master')
+        git.pull
         puts "Creating new branch #{branch_name} from master".green
         git.branch(branch_name).checkout
       end

data/lib/flight_plan_cli/commands/list.rb

@@ -1,6 +1,9 @@
 module FlightPlanCli
   module Commands
     class List
+      include FlightPlanCli::Clients::Git
+      include FlightPlanCli::Clients::FlightPlan
+
       module Color
         SWIMLANE = :cyan
         ISSUE = :yellow
@@ -8,15 +11,9 @@ module FlightPlanCli
         CHECKED_OUT_BACKGROUND = :light_black
       end
 
-      include FlightPlanCli::Config
-
-      def initialize
-        read_config
-      end
-
       def process
         swimlanes = tickets_by_swimlane
-        default_swimlane_ids.each do |swimlane_id|
+        Settings.default_swimlane_ids.each do |swimlane_id|
           next unless swimlanes.key?(swimlane_id)
 
           print_swimlane(swimlanes[swimlane_id])
@@ -31,14 +28,14 @@ module FlightPlanCli
       private
 
       def tickets_by_swimlane
-        response = client.board_tickets
+        response = flight_plan.board_tickets
         raise ApiUnauthorized if response.code == 401
         raise ApiNotFound if response.code == 404
 
         swimlanes = {}
         response.each do |board_ticket|
           swimlane = board_ticket['swimlane']
-          next unless default_swimlane_ids.include? swimlane['id']
+          next unless Settings.default_swimlane_ids.include? swimlane['id']
 
           swimlanes[swimlane['id']] ||= swimlane
           swimlanes[swimlane['id']]['tickets'] ||= []

data/lib/flight_plan_cli/initializer.rb

@@ -1,16 +1,8 @@
-
 module FlightPlanCli
   class ApiUnauthorized < StandardError; end
   class ApiNotFound < StandardError; end
 
   class Initializer < Thor
-    include FlightPlanCli::Config
-
-    def initialize(*args)
-      read_config
-      super
-    end
-
     desc 'ls', 'List open issues'
     def ls
       Commands::List.new.process

data/lib/flight_plan_cli/settings.rb

@@ -0,0 +1,46 @@
+module FlightPlanCli
+  module Settings
+    CONFIG_YAML_PATH = '.flight_plan_cli/config.yml'.freeze
+    USER_YAML_PATH = '.flight_plan_cli/user.yml'.freeze
+
+    def self.board_id
+      config['board_id']
+    end
+
+    def self.repo_id
+      config['repo_id']
+    end
+
+    def self.default_swimlane_ids
+      config['ls']['default_swimlane_ids']
+    end
+
+    def self.api_url
+      config['api_url']
+    end
+
+    def self.api_key
+      config['flight_plan_api_key']
+    end
+
+    def self.api_secret
+      config['flight_plan_api_secret']
+    end
+
+    def self.config
+      @config ||=
+        begin
+          check_config_exists
+          YAML.load_file(CONFIG_YAML_PATH).merge(
+            FileTest.exist?(USER_YAML_PATH) ? YAML.load_file(USER_YAML_PATH) : {}
+          )
+        end
+    end
+
+    def self.check_config_exists
+      return if FileTest.exist?(CONFIG_YAML_PATH)
+      puts "#{CONFIG_YAML_PATH} not found"
+      exit 1
+    end
+  end
+end

data/lib/flight_plan_cli.rb

@@ -1,7 +1,9 @@
 require 'thor'
 require 'colorize'
 require 'git'
-require 'flight_plan_cli/config'
+require 'flight_plan_cli/settings'
+require 'flight_plan_cli/clients/git'
+require 'flight_plan_cli/clients/flight_plan'
 require 'flight_plan_cli/commands/list'
 require 'flight_plan_cli/commands/checkout'
 require 'flight_plan_cli/initializer'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flight_plan_cli
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - John Cleary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-19 00:00:00.000000000 Z
+date: 2018-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -176,10 +176,12 @@ files:
 - bin/flight
 - lib/flight_plan_cli.rb
 - lib/flight_plan_cli/api.rb
+- lib/flight_plan_cli/clients/flight_plan.rb
+- lib/flight_plan_cli/clients/git.rb
 - lib/flight_plan_cli/commands/checkout.rb
 - lib/flight_plan_cli/commands/list.rb
-- lib/flight_plan_cli/config.rb
 - lib/flight_plan_cli/initializer.rb
+- lib/flight_plan_cli/settings.rb
 - lib/flight_plan_cli/version.rb
 homepage: https://github.com/jcleary/flight_plan_cli
 licenses:

data/lib/flight_plan_cli/config.rb

@@ -1,51 +0,0 @@
-module FlightPlanCli
-  module Config
-    private
-
-    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
-
-    def read_config
-      @board_id = config['board_id']
-      @repo_id = config['repo_id']
-      @default_swimlane_ids = config['ls']['default_swimlane_ids']
-
-      @api_url = config['api_url']
-      @api_key = config['flight_plan_api_key']
-      @api_secret = config['flight_plan_api_secret']
-    end
-
-    def client
-      @client ||= FlightPlanCli::Api.new(
-        url: api_url,
-        key: api_key,
-        secret: api_secret,
-        board_id: board_id,
-        repo_id: repo_id
-      )
-    end
-
-    def git
-      @git ||= Git.open(Dir.pwd)
-    end
-
-    def config
-      @config ||=
-        begin
-          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