flight_plan_cli 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4b7888cb0ed509d5dc14e48c856f67c929c3a68
-  data.tar.gz: af5a01246e6979e28eda904000280d796ecd9f6b
+  metadata.gz: 8dfec330bff6d5d502e675e8735f53583d62b52c
+  data.tar.gz: aef12432b2608aa887e15520e2272384c0246fac
 SHA512:
-  metadata.gz: 12efa16013e4409e369a63a21049edd4298c74914ea3e7bff8b90eb918b1507ac1db407f80ffbd8ac9dc72a996a1cd9a9ab35b64d4b9253e6637e1c881f01d53
-  data.tar.gz: c6e89e95945b59f862eae6c5f63db34405a88c450cd1b66c01a86031b207972f6ad716902e21d45a57e5cf58b9e467300ce91472f1efaa44016d15c462c87052
+  metadata.gz: bde04240bf206d50d1f5365e08a0ba95fbc4377959bcebf914c8b77b88c2e8288a97b4f4eef0d14a8d4c60a7733a8a0d69f6aa5e354d373c77221b506299be82
+  data.tar.gz: 3e44b780dc1035fe0e1217dae0fe7c29fc3300d8c967b6dd469a2dda997c234f6baa510414ecda1fe6312ffa1d2cba56672ffca002f92faa5e06c93b9c820046

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/flight_plan_cli/commands/checkout.rb

@@ -0,0 +1,61 @@
+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)
+      rescue Rugged::CheckoutError => e
+        puts "Unable to checkout: #{e.message}".red
+      end
+
+      def local_branch_for(issue)
+        issue_branches = local_branches.map(&:name).grep(/##{issue}[^0-9]/)
+        return false unless issue_branches.count == 1
+
+        branch = issue_branches.first
+        puts "Checking out local branch '#{branch}'".green
+        git.checkout(branch)
+        true
+      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
+        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)
+      end
+
+      def remote_branches
+        @remote_branches ||= git.branches.each(:remote)
+      end
+
+      def git
+        @git ||= Rugged::Repository.new(Dir.pwd)
+      end
+
+      def fetch
+        puts 'Fetching...'.green
+        git.remotes.each { |remote| remote.fetch(credentials: ssh_agent) }
+      end
+
+      def ssh_agent
+        @ssh_agent ||= Rugged::Credentials::SshKeyFromAgent.new(username: 'git')
+      end
+    end
+  end
+end

data/lib/flight_plan_cli/commands/ls.rb

@@ -0,0 +1,50 @@
+module FlightPlanCli
+  module Commands
+    class Ls
+      include FlightPlanCli::Config
+
+      def initialize
+        read_config
+      end
+
+      def process
+        swimlanes = tickets_by_swimlane
+        default_swimlane_ids.each do |swimlane_id|
+          next unless swimlanes.key?(swimlane_id)
+
+          print_swimlane(swimlanes[swimlane_id])
+        end
+      rescue ApiUnauthorized
+        puts 'Unauthorize. Please ensure your key and secret as setup correctly'.red
+      rescue Errno::ECONNREFUSED, SocketError => e
+        # TODO: caching - low timeout (5s) then fallback to cache
+        puts "Network error. #{e.message}".red
+      end
+
+      def tickets_by_swimlane
+        response = client.board_tickets(board_id: board_id, repo_id: repo_id)
+        puts 'ok2'
+        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']
+
+          swimlanes[swimlane['id']] ||= swimlane
+          swimlanes[swimlane['id']]['tickets'] ||= []
+          swimlanes[swimlane['id']]['tickets'] << board_ticket['ticket']
+        end
+        swimlanes
+      end
+
+      def print_swimlane(swimlane)
+        puts "#{swimlane['name']} (#{swimlane['tickets'].count})".green
+        swimlane['tickets'].each do |ticket|
+          puts "├── #{ticket['remote_number'].rjust(4)} : #{ticket['remote_title']}".yellow
+        end
+      end
+    end
+  end
+end

data/lib/flight_plan_cli/config.rb

@@ -0,0 +1,37 @@
+module FlightPlanCli
+  module Config
+    YAML_FILE = '.flight_plan_cli.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 = ENV['FLIGHT_PLAN_API_KEY']
+      @api_secret = ENV['FLIGHT_PLAN_API_SECRET']
+    end
+
+    def client
+      @client ||= FlightPlanCli::Api.new(
+        url: api_url,
+        key: api_key,
+        secret: api_secret
+      )
+    end
+
+    def config
+      @config ||=
+        begin
+          unless File.exist?(YAML_FILE)
+            puts "Could not file #{YAML_FILE} file."
+            exit 1
+          end
+          YAML.load_file(YAML_FILE)
+        end
+    end
+  end
+end

data/lib/flight_plan_cli/initializer.rb

@@ -7,7 +7,7 @@ module FlightPlanCli
   class ApiNotFound < StandardError; end
 
   class Initializer < Thor
-    YAML_FILE = '.flight_plan_cli.yml'.freeze
+    include FlightPlanCli::Config
 
     def initialize(*args)
       read_config
@@ -16,128 +16,14 @@ module FlightPlanCli
 
     desc 'ls', 'List open issues'
     def ls
-      swimlanes = tickets_by_swimlane
-      default_swimlane_ids.each do |swimlane_id|
-        next unless swimlanes.key?(swimlane_id)
-
-        print_swimlane(swimlanes[swimlane_id])
-      end
-    rescue ApiUnauthorized
-      puts 'Unauthorize. Please ensure your key and secret as setup correctly'.red
-    rescue Errno::ECONNREFUSED, SocketError => e
-      # TODO: caching - low timeout (5s) then fallback to cache
-      puts "Network error. #{e.message}".red
+      Commands::Ls.new.process
     end
 
     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(issue_no)
-    rescue Rugged::CheckoutError => e
-      puts "Unable to checkout: #{e.message}".red
+      Commands::Checkout.new.process(issue_no)
     end
 
     map co: :checkout
-
-    private
-
-    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 = ENV['FLIGHT_PLAN_API_KEY']
-      @api_secret = ENV['FLIGHT_PLAN_API_SECRET']
-    end
-
-    def local_branch_for(issue)
-      issue_branches = local_branches.map(&:name).grep(/##{issue}[^0-9]/)
-      return false unless issue_branches.count == 1
-
-      branch = issue_branches.first
-      puts "Checking out local branch '#{branch}'".green
-      git.checkout(branch)
-      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)
-    end
-
-    def remote_branches
-      @remote_branches ||= git.branches.each(:remote)
-    end
-
-    def git
-      @git ||= Rugged::Repository.new(Dir.pwd)
-    end
-
-    def fetch
-      puts 'fetching...'
-      git.remotes.each(&:fetch)
-    end
-
-    def print_swimlane(swimlane)
-      puts "#{swimlane['name']} (#{swimlane['tickets'].count})".green
-      swimlane['tickets'].each do |ticket|
-        puts "├── #{ticket['remote_number'].rjust(4)} : #{ticket['remote_title']}".yellow
-      end
-    end
-
-    def tickets_by_swimlane
-      response = client.board_tickets(board_id: board_id, repo_id: repo_id)
-      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']
-
-        swimlanes[swimlane['id']] ||= swimlane
-        swimlanes[swimlane['id']]['tickets'] ||= []
-        swimlanes[swimlane['id']]['tickets'] << board_ticket['ticket']
-      end
-      swimlanes
-    end
-
-    def config
-      @config ||=
-        begin
-          unless File.exist?(YAML_FILE)
-            puts "Could not file #{YAML_FILE} file."
-            exit 1
-          end
-          YAML.load_file(YAML_FILE)
-        end
-    end
-
-    def client
-      @client ||= FlightPlanCli::Api.new(
-        url: api_url,
-        key: api_key,
-        secret: api_secret
-      )
-    end
   end
 end

data/lib/flight_plan_cli.rb

@@ -1,4 +1,7 @@
 require 'dotenv/load'
+require 'flight_plan_cli/config'
+require 'flight_plan_cli/commands/ls'
+require 'flight_plan_cli/commands/checkout'
 require 'flight_plan_cli/initializer'
 require 'flight_plan_cli/version'
 require 'flight_plan_cli/api'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flight_plan_cli
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - John Cleary
@@ -190,6 +190,9 @@ files:
 - bin/fp
 - 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/config.rb
 - lib/flight_plan_cli/initializer.rb
 - lib/flight_plan_cli/version.rb
 homepage: https://github.com/jcleary/flight_plan_cli