flight_plan_cli 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1810e692ec7b8c0be42e10fddedcfbe259723b1b
-  data.tar.gz: 8b0f6ca9815a9177796481556bc192dcac748f6f
+  metadata.gz: 5faa3c024a368a1b31c0ba594f0ed7aad71f8470
+  data.tar.gz: c5f6f0e7633224a2d879a9398a3ace6e6cb272a8
 SHA512:
-  metadata.gz: 54d03ae9f528ef6f8f9f057c252248c9edab40cf8bc902b1ccb54512c51b18c982369e9ce70471d86d250bae08d7efc406b8343952ba98c6a7fb917dbc37382f
-  data.tar.gz: e5c34f4ba0842a27f6be3d14650667e991d61a155309d9cb1aca606c9c327888e7c2d33b2d3cdec7f520bcb0d154c8e0610994578bc929b72f2beae13c86ab4e
+  metadata.gz: 9f33825b438064b0d8d0bd1b2ce27b9bcad578749b3fc09596d11f57cfd5f8dd6429ad7febfb1f542fd7855c60a2e9e301a2459c80a5624902fd3343df5465bb
+  data.tar.gz: 104e6755bff099711d4b15a5fe074f802a111d88b650e95fa430157326967ad2f3c1ac7b14ecdc03df4736cbcd4a29cbe54ca66dd9160218ea7a0f9751aedaa5

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/flight_plan_cli/api.rb

@@ -20,6 +20,17 @@ module FlightPlanCli
       HTTParty.get("#{url}/boards/#{board_id}/board_tickets.json", query: params, headers: headers)
     end
 
+    def create_release(title = nil)
+      params = {
+        release: {
+          title: title || 'FlightPlan CLI release',
+          repo_ids: [repo_id]
+        }
+      }
+
+      HTTParty.post("#{url}/boards/#{board_id}/releases", body: params.to_json, headers: headers)
+    end
+
     private
 
     attr_reader :url, :key, :secret
@@ -27,7 +38,8 @@ module FlightPlanCli
 
     def headers
       @headers = {
-        'Authorization' => "Token token=\"#{key}:#{secret}\""
+        'Authorization' => "Token token=\"#{key}:#{secret}\"",
+        'Content-Type' => 'application/json'
       }
     end
   end

data/lib/flight_plan_cli/clients/flight_plan.rb

@@ -3,11 +3,11 @@ module FlightPlanCli
     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
+          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

data/lib/flight_plan_cli/commands/checkout.rb

@@ -4,8 +4,10 @@ module FlightPlanCli
       include FlightPlanCli::Clients::Git
       include FlightPlanCli::Clients::FlightPlan
 
-      def initialize(issue_no)
+      def initialize(issue_no, options)
         @issue_no = issue_no
+        @base_branch = options["base"]
+        @branch_prefix = options["prefix"]
         @fetched = false
       end
 
@@ -18,7 +20,7 @@ module FlightPlanCli
 
       private
 
-      attr_reader :issue_no
+      attr_reader :issue_no, :base_branch, :branch_prefix
 
       def local_branch_for_issue
         issue_branches = local_branches.map(&:name).grep(/##{issue_no}[^0-9]/)
@@ -49,14 +51,14 @@ module FlightPlanCli
         return false unless branches.count == 1
 
         branch_name = branch_name(branches.first)
-        git.checkout('master')
+        git.checkout(base_branch)
         git.pull
-        puts "Creating new branch #{branch_name} from master".green
+        puts "Creating new branch #{branch_name} from #{base_branch}".green
         git.branch(branch_name).checkout
       end
 
       def branch_name(branch)
-        "feature/##{branch['ticket']['remote_number']}-" +
+        "#{branch_prefix}/##{branch['ticket']['remote_number']}-" +
           branch['ticket']['remote_title']
             .gsub(/\([^)]*\)/, '') # remove everything inside brackets
             .match(/^.{0,60}\b/)[0] # take the first 60 chars (finish on word boundry)

data/lib/flight_plan_cli/commands/config.rb

@@ -0,0 +1,32 @@
+module FlightPlanCli
+  module Commands
+    class Config
+      def process
+        # Load config up-front to trigger any errors
+        FlightPlanCli.settings.config
+
+        puts '= CONFIG ===='.bold
+        puts "Using #{FlightPlanCli.settings.base_config_file}".green
+        pretty_print FlightPlanCli.settings.base_config
+
+        puts
+
+        puts '= USER ===='.bold
+        user_file = FlightPlanCli.settings.user_config_file
+
+        if user_file
+          puts "Using #{user_file}".green
+          pretty_print FlightPlanCli.settings.user_config
+        else
+          puts 'No user config file found'.yellow
+        end
+      end
+
+      private
+
+      def pretty_print(config)
+        puts YAML.dump(config).sub(/^---\n/, '')
+      end
+    end
+  end
+end

data/lib/flight_plan_cli/commands/list.rb

@@ -13,7 +13,7 @@ module FlightPlanCli
 
       def process
         swimlanes = tickets_by_swimlane
-        Settings.default_swimlane_ids.each do |swimlane_id|
+        FlightPlanCli.settings.default_swimlane_ids.each do |swimlane_id|
           next unless swimlanes.key?(swimlane_id)
 
           print_swimlane(swimlanes[swimlane_id])
@@ -35,7 +35,7 @@ module FlightPlanCli
         swimlanes = {}
         response.each do |board_ticket|
           swimlane = board_ticket['swimlane']
-          next unless Settings.default_swimlane_ids.include? swimlane['id']
+          next unless FlightPlanCli.settings.default_swimlane_ids.include? swimlane['id']
 
           swimlanes[swimlane['id']] ||= swimlane
           swimlanes[swimlane['id']]['tickets'] ||= []

data/lib/flight_plan_cli/commands/release.rb

@@ -4,13 +4,23 @@ module FlightPlanCli
       include FlightPlanCli::Clients::FlightPlan
 
       def process
-        release = flight_plan.create_release
-        p release
+        response = flight_plan.create_release
+        unless response.code == 201
+          puts "Failed to create a release (#{response.code})".red
+          if response['errors'].present?
+            response['errors'].each do |error|
+              puts "error: #{error}".red
+            end
+          end
+          return
+        end
+
+        release = response['release']
         repo_release = release['repo_releases'].first
-        puts "Created #{repo_release['repo']['name']} release \"#{release['title']}\" with the following tickets:"
+        puts "Created #{repo_release['repo']['name']} release \"#{release['title']}\" with the following tickets:".green
         repo_release['board_tickets'].each do |board_ticket|
           ticket = board_ticket['ticket']
-          puts "  ##{ticket['remote_number']} - #{ticket['remote_title']}"
+          puts "  ##{ticket['remote_number']} - #{ticket['remote_title']}".green
         end
       end
     end

data/lib/flight_plan_cli/initializer.rb

@@ -9,10 +9,22 @@ module FlightPlanCli
     end
 
     desc 'checkout ISSUE_NO', 'checkout a branch for ISSUE_NO'
+    option :base, desc: 'base branch for the new branch', aliases: :b, default: 'master'
+    option :prefix, desc: 'prefix for the new branch', aliases: :p, default: 'feature'
     def checkout(issue_no)
-      Commands::Checkout.new(issue_no).process
+      Commands::Checkout.new(issue_no, options).process
+    end
+
+    desc 'release', 'create a release'
+    def release
+      Commands::Release.new.process
     end
 
     map co: :checkout
+
+    desc 'config', 'Print current config'
+    def config
+      Commands::Config.new.process
+    end
   end
 end

data/lib/flight_plan_cli/settings.rb

@@ -1,46 +1,80 @@
 module FlightPlanCli
-  module Settings
+  class Settings
     CONFIG_YAML_PATH = '.flight_plan_cli/config.yml'.freeze
     USER_YAML_PATH = '.flight_plan_cli/user.yml'.freeze
 
-    def self.board_id
+    def board_id
       config['board_id']
     end
 
-    def self.repo_id
+    def repo_id
       config['repo_id']
     end
 
-    def self.default_swimlane_ids
+    def default_swimlane_ids
       config['ls']['default_swimlane_ids']
     end
 
-    def self.api_url
+    def api_url
       config['api_url']
     end
 
-    def self.api_key
+    def api_key
       config['flight_plan_api_key']
     end
 
-    def self.api_secret
+    def api_secret
       config['flight_plan_api_secret']
     end
 
-    def self.config
-      @config ||=
+    def config
+      @config ||= base_config.merge(user_config)
+    end
+
+    def base_config_file
+      @base_config_file ||=
         begin
-          check_config_exists
-          YAML.load_file(CONFIG_YAML_PATH).merge(
-            FileTest.exist?(USER_YAML_PATH) ? YAML.load_file(USER_YAML_PATH) : {}
-          )
+          locate_file(CONFIG_YAML_PATH) or Utils.quit("#{CONFIG_YAML_PATH} not found")
         end
     end
 
-    def self.check_config_exists
-      return if FileTest.exist?(CONFIG_YAML_PATH)
-      puts "#{CONFIG_YAML_PATH} not found"
-      exit 1
+    def base_config
+      @base_config ||= load_yaml(base_config_file)
+    end
+
+    def user_config_file
+      @user_config_file ||= locate_file(USER_YAML_PATH)
+    end
+
+    def user_config
+      @user_config ||= load_yaml(user_config_file)
+    end
+
+    private
+
+    def locate_file(filename)
+      Pathname.pwd.ascend do |path|
+        found_file = path.join(filename)
+
+        return found_file if found_file.readable? && !found_file.directory?
+        break if path == home_directory
+      end
+    end
+
+    def load_yaml(filename)
+      if filename
+        YAML.load_file(filename)
+      else
+        {}
+      end
+    rescue YAML::Exception => error
+      Utils.quit "Error parsing `#{filename}`:", error
+    rescue => error
+      Utils.quit "Error loading `#{filename}`:", error
+    end
+
+    def home_directory
+      @home_directory ||= Pathname.new(Dir.home)
     end
   end
 end

data/lib/flight_plan_cli/utils.rb

@@ -0,0 +1,14 @@
+module FlightPlanCli
+  module Utils
+    def self.quit(message, error = nil)
+      warn message.red.bold
+
+      if error
+        warn "\n  #{error.class}: #{error.message}".yellow
+        warn(error.backtrace.map {|line| "    #{line}".white })
+      end
+
+      exit 1
+    end
+  end
+end

data/lib/flight_plan_cli.rb

@@ -1,11 +1,20 @@
 require 'thor'
 require 'colorize'
 require 'git'
+require 'flight_plan_cli/utils'
 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/commands/release'
+require 'flight_plan_cli/commands/config'
 require 'flight_plan_cli/initializer'
 require 'flight_plan_cli/version'
 require 'flight_plan_cli/api'
+
+module FlightPlanCli
+  def self.settings
+    @settings ||= Settings.new
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flight_plan_cli
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - John Cleary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-31 00:00:00.000000000 Z
+date: 2018-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.15.4
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.14.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.14.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -179,10 +193,12 @@ files:
 - 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/config.rb
 - lib/flight_plan_cli/commands/list.rb
 - lib/flight_plan_cli/commands/release.rb
 - lib/flight_plan_cli/initializer.rb
 - lib/flight_plan_cli/settings.rb
+- lib/flight_plan_cli/utils.rb
 - lib/flight_plan_cli/version.rb
 homepage: https://github.com/jcleary/flight_plan_cli
 licenses: