github-trello-cl 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ae309b5667e125bcc1e13bfff8b932109547616
-  data.tar.gz: f0a476e318e67b9da2db3f3fbd2d20e19fb2ce69
+  metadata.gz: 8a56f67ba2029ffa78fa25827e72ddb6d3e85052
+  data.tar.gz: 6e5987510f3bd05ca64e1f2517c605e3d8a8fcc3
 SHA512:
-  metadata.gz: b9d93f3582be6b1067dda282f2396eeb94c9c8995801247b30758b308e19db2b5a86cb2a8d1e8d96b69fd25dce5d1e6a5644c23a9ec2d865ee2605b7bedd66ac
-  data.tar.gz: e43af0607cd3ae4a1ac167691f479300c377779af3c9486582cd77e6f26d6cd022a751f076aaa6c15d913a066419a006019f89c57a8ec90d1a92b64c1faaf4df
+  metadata.gz: 79a3faa5ecdc6f4e91f8ec906e29d99f719928e2743496b87e546868bdb4c2ffa82f8e659d470bb43853fd6bf425e680a3d30ffa13d41ed1b5fc7e774eb44f4e
+  data.tar.gz: 50d7f7ada173a8f88583cad47e67396e9ce4cc18e563f44ebb87bb315795faf02e605bae4756be7c28922970576c3469c49d3ae2cbf330ee151d9e656ed81203

data/Gemfile.lock

@@ -1,12 +1,11 @@
 PATH
   remote: .
   specs:
-    trello (0.0.2)
-      commander
-      configuration
-      httparty
-      launchy
-      recursive-open-struct
+    github-trello-cl (0.0.3)
+      commander (~> 4.3.0)
+      httparty (~> 0.13.3)
+      launchy (~> 2.4.3)
+      recursive-open-struct (>= 0.5.0)
 
 GEM
   remote: https://rubygems.org/
@@ -14,7 +13,6 @@ GEM
     addressable (2.3.7)
     commander (4.3.0)
       highline (~> 1.6.11)
-    configuration (1.3.4)
     highline (1.6.21)
     httparty (0.13.3)
       json (~> 1.8)
@@ -31,5 +29,5 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.6)
+  github-trello-cl!
   rake (~> 10.3.1)
-  trello!

data/lib/trello.rb

@@ -4,10 +4,15 @@ require 'launchy'
 require 'recursive-open-struct'
 require 'trello/constants'
 require 'trello/helpers'
+require 'trello/trello_config'
+require 'trello/api/all'
+require 'trello/core_ext/string'
 
 module Trello
   class Main
     include Commander::Methods
+    include Helpers
+    include TrelloConfig
 
     def run
       program :name, "Trello"
@@ -17,8 +22,13 @@ module Trello
       command :init do |c|
         c.syntax = 'trello init'
         c.description = 'Generates a default config file for the Trello CLI so it can be used in this directory.'
+        c.option '--force', 'Overwrites an existing config file.'
         c.action do |args, options|
-          FileUtils.cp(File.join(Helpers::root, '.trelloconfig.default'), './.trelloconfig')
+          if File.exist? CONFIG_FILE_NAME && !options.force
+            abort "Config file already exists. Run 'trello init -f' to overwrite it."
+          end
+
+          FileUtils.cp(File.join(root, '.trelloconfig.default'), "./#{CONFIG_FILE_NAME}")
           say "Created .trelloconfig in this directory."
         end
       end
@@ -30,27 +40,26 @@ module Trello
           trello_config = {base_url: "https://api.trello.com/1/"}
           trello_config[:api_key] = ask("API key?")
           
-          url = "https://trello.com/1/authorize?key=#{trello_config[:api_key]}&name=Your+Application&expiration=never&response_type=token&scope=read,write"
           puts "Requesting access to this application..."
           sleep(0.5)
-          Launchy.open(url)
+          Launchy.open("https://trello.com/1/authorize?key=#{trello_config[:api_key]}&name=Your+Application&expiration=never&response_type=token&scope=read,write")
           sleep(0.5)
           trello_config[:token] = ask("What was the token?")
 
-          trello_config[:board_id] = Helpers::prompt_for("Which board should the API reference? (ID)") do
-            result = Helpers::make_trello_api_call(:get, "members/me", key: trello_config[:api_key], token: trello_config[:token], boards: 'open')['boards']
+          trello_config[:board_id] = prompt_from_options("Which board should the API reference? (ID)") do
+            result = Api::Trello.make_call(:get, "members/me", key: trello_config[:api_key], token: trello_config[:token], boards: 'open')['boards']
 
             result.map do |board|
               {id: board['id'], name: board['name']}
             end
           end
 
-          lists_resp = Helpers::make_trello_api_call(:get, "boards/#{trello_config[:board_id]}", key: trello_config[:api_key], token: trello_config[:token], lists: 'open')
+          lists_resp = Api::Trello.make_call(:get, "boards/#{trello_config[:board_id]}", {key: trello_config[:api_key], token: trello_config[:token], lists: 'open'})
           lists = lists_resp['lists'].map do |list|
             {id: list['id'], name: list['name']}
           end
 
-          trello_config[:pending_columns] = Helpers::prompt_for_array("Which lists hold pending tasks? (ID,ID)") { lists }
+          trello_config[:pending_columns] = prompt_for_list_from_options("Which lists hold pending tasks? (ID,ID)") { lists }
 
           {
             in_development_column: "Which column represents tasks in development? (ID)",
@@ -58,7 +67,7 @@ module Trello
             approved_merged_column: "Which column represents tasks approved/merged to staging? (ID)",
             deployed_column: "Which column represents tasks deployed to production? (ID)"
           }.each do |field, message|
-            trello_config[field] = Helpers::prompt_for(message) { lists }
+            trello_config[field] = prompt_from_options(message) { lists }
           end
 
           config_file = {
@@ -67,7 +76,7 @@ module Trello
 
           puts "Saving to config.json..."
 
-          Helpers::write_json_to_file(config_file, './config.json')
+          write_json_to_file(config_file, './config.json')
         end
       end
 
@@ -75,31 +84,51 @@ module Trello
         c.syntax = 'trello config --<field> value'
         c.description = 'Configure options for the integration'
         c.option '--user USERNAME', 'Configures the user\'s Trello username (required)'
-        c.option '--prefix initials', 'Initials to prepend to new branch names, e.g. \'[initials]-branch-name\''
+        c.option '--key APIKEY', 'Configures the user\'s API key for access to the API backend'
+        c.option '--url PATH', 'Configures the path to this trello CL\'s API backend'
         c.action do |args, options|
-          if options.user
-            response = Helpers::make_trello_api_call(:get, "members/#{options.user}", {fields: :none},
-              not_found: "Couldn't find user #{options.user}.")
-            Helpers::config.user = response['id']
-          end
+          unless [options.user, options.url, options.key].all?(&:nil?)
+            if options.user
+              response = Api::Trello.make_call(:get, "members/#{options.user}", {fields: :none})
+              config.user = response['id']
+            end
+
+            if options.url
+              config.url = format_api_url(options.url)
+            end
 
-          Helpers::config.prefix = options.prefix if options.prefix
+            if options.key
+              config.api_key = options.key
+            end
 
-          Helpers::save_config
+            puts "Config updated."
+            save_config
+          else
+            puts config.to_hash.to_yaml
+          end
         end
       end
 
       command :tasks do |c|
         c.syntax = 'trello tasks [status]'
-        c.description = 'Shows tasks assigned to the configured user. If status is provided, shows tasks with the given status'
+        c.description = 'Shows tasks assigned to the configured user. If status is provided, shows tasks with the given status. Available statuses are pending, in_development, in_review, and approved.'
         c.option '--all', 'Shows all tasks with the provided status, regardless of assignee'
         c.action do |args, options|
-          user = options.all ? nil : Helpers::config['user']
-
           status = args[0] || 'pending'
 
-          response = Helpers::make_integration_api_call(:get, "cards/#{status}", {},
-            bad_request: "Could not find lists for status #{status}.")
+          unless options.all
+            user_check
+          end
+          
+          user = options.all ? nil : config['user']
+
+          response = Api::Integration.make_call(:get, "cards/#{status}", {})
+
+          all_cards = response.map{|list| list['cards']}.flatten
+
+          if (all_cards.length == 0) || (user && all_cards.select{|card| card['idMembers'].include?(user)}.length == 0)
+            abort "Found no cards."
+          end
 
           enable_paging
           response.each do |list|
@@ -126,21 +155,19 @@ module Trello
         c.description = "Marks the specified card as 'in development' on Trello and associates the specified branch with the card."
         c.option '--no-branch', 'Starts the card without creating a new branch.' 
         c.action do |args, options|
-          user = Helpers::config['user']
-          unless user
-            abort "You don't have a username configured - set one up so you can be assigned to cards"
-          end
+          card_number, branch = args
+
+          user_check
 
-          unless args[1] || options['no-branch']
+          user = config['user']
+
+          unless branch || options['no-branch']
             abort 'You need a branch name. To start this card without a branch, set the --no-branch flag (-n).'
           end
 
-          branch = Helpers::config['prefix'] ? "#{Helpers::config['prefix']}-#{args[1]}" : args[1]
-
-          response = Helpers::make_integration_api_call(:post, "cards/#{args[0]}/start", {user: user, branch: branch},
-            not_found: "Could not find card #{args[0]}.")
+          response = Api::Integration.make_call(:post, "cards/#{card_number}/start", {user: user, branch: branch})
 
-          say "Started card '#{response.parsed_response['name']}' with branch #{branch}."
+          say response.parsed_response
         end
       end
 

data/lib/trello/api/all.rb

@@ -0,0 +1,3 @@
+require 'trello/api/base'
+require 'trello/api/integration'
+require 'trello/api/trello'

data/lib/trello/api/base.rb

@@ -0,0 +1,19 @@
+require 'httparty'
+
+module Trello
+  module Api
+    class Base
+      class << self
+        def make_call(method, url, body, headers)
+          result = HTTParty.public_send(method, url, body: body, headers: headers)
+
+          unless result.success?
+            abort "#{result.code} error: #{result.body}"
+          end
+
+          result
+        end
+      end
+    end
+  end
+end

data/lib/trello/api/integration.rb

@@ -0,0 +1,17 @@
+module Trello
+  module Api
+    class Integration < Base
+      class << self
+        include TrelloConfig
+        def default_headers
+          {'Authorization' => "token #{config.api_key}"}
+        end
+
+        def make_call(method, endpoint, body = {}, headers = {})
+          param_check 'url', "You need to specify where your API backend is hosted with 'trello config --url <API URL>'."
+          super(method, "#{config['url']}#{endpoint}", body, headers.merge(default_headers))
+        end
+      end
+    end
+  end
+end

data/lib/trello/api/trello.rb

@@ -0,0 +1,10 @@
+module Trello
+  module Api
+    class Trello < Base
+      include TrelloConfig
+      def self.make_call(method, endpoint, body = {}, headers = {})
+        super(method, "https://api.trello.com/1/#{endpoint}", body, headers)
+      end
+    end
+  end
+end

data/lib/trello/constants.rb

@@ -1,9 +1 @@
-CONFIG_FILE_NAME = '.trelloconfig'
-# API_BASE_PATH = "https://trello.bookbub.com/api/"
-API_BASE_PATH = "http://trellobub.herokuapp.com/"
-DEFAULT_ERROR_MESSAGES = {
-  bad_request: "Invalid request.",
-  auth: "Failed to authenticate.",
-  not_found: "Couldn't find the site.",
-  server_error: "Something broke in the server."
-}
+CONFIG_FILE_NAME = '.trelloconfig'

data/lib/trello/core_ext/string.rb

@@ -0,0 +1,9 @@
+class String
+  def to_i
+    begin
+      Integer(self || '')
+    rescue ArgumentError
+      nil
+    end
+  end
+end

data/lib/trello/helpers.rb

@@ -1,119 +1,64 @@
 module Trello
   module Helpers
-    class << self
-      def root
-        File.dirname __dir__
-      end
-
-      def make_api_call(method, url, body, errors = {})
-        api_errors = DEFAULT_ERROR_MESSAGES.merge(errors)
-        result = HTTParty.public_send(method, url, body: body)
-
-        unless result.success?
-          bad_response_msg = case result.code
-            when 400
-              api_errors[:bad_request]
-            when 401
-              api_errors[:auth]
-            when 404
-              api_errors[:not_found]
-            when 500
-              api_errors[:server_error]
-            else
-              "No message for error #{result.code}, message returned was #{result.inspect}"
-          end
-
-          abort bad_response_msg
-        end
-
-        result
-      end
-
-      def make_trello_api_call(method, endpoint, body, errors = {})
-        trello_errors = {
-          bad_request: "Authentication failed with token #{body[:token]}",
-          not_found: "Could not find Trello server - are you online?",
-          server_error: "Something blew up."
-        }.merge(errors)
-
-        make_api_call(method, "https://api.trello.com/1/#{endpoint}", body, trello_errors)
-      end
+    def root
+      File.dirname __dir__
+    end
 
-      def make_integration_api_call(method, endpoint, body, errors = {})
-        make_api_call(method, "#{API_BASE_PATH}#{endpoint}", body, errors)
+    def format_api_url(url)
+      url = 'http://' + url unless url.start_with?('http://')
+      url += '/' unless url.end_with?('/')
+      begin
+        # ensure it's a valid url before returning
+        URI.parse(url).to_s
+      rescue
+        abort "#{url} is not a valid URL."
       end
+    end
 
-      def to_i(str)
-        begin
-          Integer(str || '')
-        rescue ArgumentError
-          nil
-        end
-      end
+    def user_check
+      param_check('user', "No user defined! Specify a user with trello config --user <username>.")
+    end
 
-      def config
-        begin
-          @config ||= RecursiveOpenStruct.new(YAML.load_file(CONFIG_FILE_NAME))
-        rescue
-          abort "Could not load config - run 'trello init' to generate a config file."
-        end
+    def prompt_for_list_from_options(prompt_message)
+      var = nil
+      options = yield
+      options.each_with_index do |opt, i|
+        puts "#{i}: #{opt[:name]}"
       end
-
-      def user_check
-        unless config['user']
-          abort "No user defined! Specify a user with trello config --user <username>."
+      until var
+        response = ask(prompt_message).split(',').map(&:to_i)
+        if response.all?{|id| id && options[id] }
+          var = options.values_at(*response).map{|option| option[:id]}
+        else
+          bad_options = response.select{|id| !(id && options[id])}
+          puts "Invalid options #{bad_options.join(', ')}. Please give numbers between 0 and #{options.length} separated by commas."
         end
       end
 
-      def save_config
-        File.open(CONFIG_FILE_NAME, 'w') {|f| f.write config.to_hash.to_yaml }
-      end
+      var
+    end
 
-      def generate_branch(name, type)
-        prefix = config.name_prefix ? "#{config.name_prefix}-" : ''
-        try_external_command "git flow #{type} start #{prefix}#{name}"
+    def prompt_from_options(prompt_message)
+      var = nil
+      options = yield
+      options.each_with_index do |opt, i|
+        puts "#{i}: #{opt[:name]}"
       end
-
-      def prompt_for_array(prompt_message)
-        var = nil
-        options = yield
-        options.each_with_index do |opt, i|
-          puts "#{i}: #{opt[:name]}"
-        end
-        until var
-          response = ask(prompt_message).split(',').map{|resp| to_i(resp)}
-          if response.all?{|id| id && options[id] }
-            var = options.values_at(*response).map{|option| option[:id]}
-          else
-            puts "Invalid array indices"
-          end
+      until var
+        response = to_i(ask(prompt_message))
+        if response && options[response]
+          var = options[response][:id]
+        else
+          say "Invalid option - please give a number between 0 and #{options.length}."
         end
-
-        var
       end
 
-      def prompt_for(prompt_message)
-        var = nil
-        options = yield
-        options.each_with_index do |opt, i|
-          puts "#{i}: #{opt[:name]}"
-        end
-        until var
-          response = to_i(ask(prompt_message))
-          if response && options[response]
-            var = options[response][:id]
-          else
-            say "Invalid array index"
-          end
-        end
-
-        var
-      end
+      var
+    end
 
-      def write_json_to_file(hash, filename)
-        puts hash
-        File.open(filename, 'w') {|f| f.write JSON.pretty_generate(hash)}
-      end
+    def write_json_to_file(hash, filename)
+      puts hash
+      File.open(filename, 'w') {|f| f.write JSON.pretty_generate(hash)}
     end
   end
 end

data/lib/trello/trello_config.rb

@@ -0,0 +1,41 @@
+module Trello
+  module TrelloConfig
+    def config
+      @config ||= load_config
+    end
+
+    def save_config
+      # need to fetch the config first to make sure its directory is properly defined
+      current_config = config
+      File.open("#{@config_dir}/#{CONFIG_FILE_NAME}" || CONFIG_FILE_NAME, 'w') {|f| f.write current_config.to_hash.to_yaml }
+    end
+
+    def param_check(field, message)
+      unless config[field]
+        abort message
+      end
+    end
+
+    def __config_dir__
+      @config_dir
+    end
+
+    protected
+
+    def load_config
+      begin
+        config = RecursiveOpenStruct.new(YAML.load_file("./#{CONFIG_FILE_NAME}"))
+        @config_dir = Dir.pwd
+        return config
+      rescue
+        if Dir.pwd == '/'
+          abort "No #{CONFIG_FILE_NAME} file found in this directory tree. Run 'trello init' to generate one."
+        else
+          Dir.chdir('..') do
+            return load_config
+          end
+        end
+      end
+    end
+  end
+end

data/trello.gemspec

@@ -2,7 +2,7 @@ $LOAD_PATH << File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'github-trello-cl'
-  s.version     = '0.0.3'
+  s.version     = '0.1.0'
   s.date        = '2015-02-23'
   s.summary     = "Interface with trello"
   s.description = "A tool to allow people using Trello as a workflow to interface with it via command line access to an API"
@@ -11,14 +11,13 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files -z`.split("\x0")
   s.require_paths = ["lib"]
   s.executables = ["trello"]
-  s.homepage    = 'http://rubygems.org/gems/trello'
+  s.homepage    = 'http://rubygems.org/gems/github-trello-cl'
 
   s.add_development_dependency 'bundler', '~> 1.6'
   s.add_development_dependency 'rake', '~> 10.3.1'
 
-  s.add_runtime_dependency 'commander'
-  s.add_runtime_dependency 'httparty'
-  s.add_runtime_dependency 'configuration'
-  s.add_runtime_dependency 'launchy'
-  s.add_runtime_dependency 'recursive-open-struct'
+  s.add_runtime_dependency 'commander', '~> 4.3.0'
+  s.add_runtime_dependency 'httparty', '~> 0.13.3'
+  s.add_runtime_dependency 'launchy', '~> 2.4.3'
+  s.add_runtime_dependency 'recursive-open-struct', '>= 0.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github-trello-cl
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Steve Pletcher
@@ -14,100 +14,86 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.3.1
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: configuration
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.3
 - !ruby/object:Gem::Dependency
   name: recursive-open-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
 description: A tool to allow people using Trello as a workflow to interface with it
   via command line access to an API
 email: steve@steve-pletcher.com
@@ -116,7 +102,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -124,10 +110,16 @@ files:
 - bin/trello
 - lib/.trelloconfig.default
 - lib/trello.rb
+- lib/trello/api/all.rb
+- lib/trello/api/base.rb
+- lib/trello/api/integration.rb
+- lib/trello/api/trello.rb
 - lib/trello/constants.rb
+- lib/trello/core_ext/string.rb
 - lib/trello/helpers.rb
+- lib/trello/trello_config.rb
 - trello.gemspec
-homepage: http://rubygems.org/gems/trello
+homepage: http://rubygems.org/gems/github-trello-cl
 licenses: []
 metadata: {}
 post_install_message: 
@@ -136,17 +128,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Interface with trello