flight_plan_cli 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c170df17f3fdd314c77a9e0fc8a177c85bb744d
-  data.tar.gz: 50e336907fbff233e0d567b447c016ad3a27a416
+  metadata.gz: 78abdf93216c32be174a21b8350173c19df18706
+  data.tar.gz: a9721ca5c475dd68cb11dd0526ae68ce69520a32
 SHA512:
-  metadata.gz: 80fa2a82cc5d6d9babb096a8f53f9f47f3a11967f861d2a799d31b0f8d43f19ee97bdcdcd60b9170d18778e9d0fed7e3bb13e57fc6c61d6632dfded6063e4755
-  data.tar.gz: 77dd03cb66792a4284803642777c7b3b509f555b38c1a685ed41d97d23f243727ab3f6cc0d3f43f9cd67dfb3958e15ffe4dd18adbe880e87a8b5cffb3b5a4c0e
+  metadata.gz: 994f2bb6917b9066089da05c5507414e9323fa70634cc6e6cb746108af967b03fa1b787ebbc8d52371a5fee597c7589cb0a152fea7b6949b55f079a915e36326
+  data.tar.gz: 45f9ffa08b3eefbf43eaaebac7ebaebd6b8e3480b1aec9de2619e142e3049a3beabec40aee184ad7bc693370b5f55427dd4cb942fcc683aa6a943254e0c803e8

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/flight_plan_cli.rb

@@ -1,4 +1,6 @@
-require 'dotenv/load'
+require 'thor'
+require 'colorize'
+require 'git'
 require 'flight_plan_cli/config'
 require 'flight_plan_cli/commands/list'
 require 'flight_plan_cli/commands/checkout'

data/lib/flight_plan_cli/commands/checkout.rb

@@ -3,23 +3,25 @@ module FlightPlanCli
     class Checkout
       include FlightPlanCli::Config
 
-      def initialize
+      def initialize(issue_no)
+        @issue_no = issue_no
+        @fetched = false
         read_config
       end
 
-      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
+      def process
+        local_branch_for_issue || remote_branch_for_issue || new_branch_for_issue
+      rescue Git::GitExecuteError => e
+        puts 'Unable to checkout'.red
+        puts e.message.yellow
       end
 
       private
 
-      def local_branch_for(issue)
-        issue_branches = local_branches.map(&:name).grep(/##{issue}[^0-9]/)
+      attr_reader :issue_no
+
+      def local_branch_for_issue
+        issue_branches = local_branches.map(&:name).grep(/##{issue_no}[^0-9]/)
         return false unless issue_branches.count == 1
 
         branch = issue_branches.first
@@ -28,8 +30,8 @@ module FlightPlanCli
         true
       end
 
-      def remote_branch_for(issue)
-        issue_branches = remote_branches.map(&:name).grep(/##{issue}[^0-9]/)
+      def remote_branch_for_issue
+        issue_branches = remote_branches.map(&:name).grep(/##{issue_no}[^0-9]/)
         return false unless issue_branches.count == 1
 
         remote_branch_name = issue_branches.first
@@ -47,51 +49,41 @@ module FlightPlanCli
         git.checkout(local_name)
       end
 
-      def new_branch_for(issue)
-        branches = client.board_tickets(remote_number: issue)
+      def new_branch_for_issue
+        git.checkout('master')
+        git.pull
+        branches = client.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 }
+        branches = branches.select { |b| b['ticket']['remote_number'] == issue_no }
         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)
+        git.branch(branch_name).checkout
       end
 
       def branch_name(branch)
         "feature/##{branch['ticket']['remote_number']}-" +
           branch['ticket']['remote_title']
-          .gsub(/[^a-z0-9\s]/i, '')
-          .tr(' ', '-')
-          .downcase
+            .gsub(/[^a-z0-9\s]/i, '')
+            .tr(' ', '-')
+            .downcase
       end
 
       def local_branches
-        @local_branches ||= git.branches.each(:local)
+        git.branches.local
       end
 
       def remote_branches
-        @remote_branches ||=
-          begin
-            fetch
-            git.branches.each(:remote)
-          end
+        fetch
+        git.branches.remote
       end
 
       def fetch
+        return if @fetched
         puts 'Fetching...'.green
-        git.remotes.each { |remote| remote.fetch(credentials: credentials) }
-      end
-
-      def credentials
-        @ssh_agent ||= Rugged::Credentials::SshKey.new(
-          username: 'git',
-          publickey: File.expand_path(git_ssh_public_key),
-          privatekey: File.expand_path(git_ssh_private_key)
-        )
+        git.remote('origin').fetch
+        @fetched = true
       end
     end
   end

data/lib/flight_plan_cli/commands/list.rb

@@ -58,7 +58,7 @@ module FlightPlanCli
       end
 
       def print_ticket(ticket)
-        checked_out = git.head.name =~ /##{ticket['remote_number']}[^0-9]/
+        checked_out = git.current_branch =~ /##{ticket['remote_number']}[^0-9]/
         line =
           "  #{ticket['remote_number']}".colorize(Color::ISSUE_NO) +
           " #{ticket['remote_title']} ".colorize(Color::ISSUE)

data/lib/flight_plan_cli/config.rb

@@ -7,7 +7,6 @@ module FlightPlanCli
 
     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']
@@ -17,8 +16,6 @@ module FlightPlanCli
       @api_url = config['api_url']
       @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
@@ -32,7 +29,7 @@ module FlightPlanCli
     end
 
     def git
-      @git ||= Rugged::Repository.new(Dir.pwd)
+      @git ||= Git.open(Dir.pwd)
     end
 
     def config

data/lib/flight_plan_cli/initializer.rb

@@ -1,6 +1,3 @@
-require 'thor'
-require 'colorize'
-require 'rugged'
 
 module FlightPlanCli
   class ApiUnauthorized < StandardError; end
@@ -21,7 +18,7 @@ module FlightPlanCli
 
     desc 'checkout ISSUE_NO', 'checkout a branch for ISSUE_NO'
     def checkout(issue_no)
-      Commands::Checkout.new.process(issue_no)
+      Commands::Checkout.new(issue_no).process
     end
 
     map co: :checkout

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flight_plan_cli
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - John Cleary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-11 00:00:00.000000000 Z
+date: 2018-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,19 +123,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.7.3
 - !ruby/object:Gem::Dependency
-  name: dotenv
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -150,20 +150,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.1
-- !ruby/object:Gem::Dependency
-  name: rugged
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.26.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.26.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement