troo 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e68baa9983b5fa453d4feceb5542febfa90bb445
-  data.tar.gz: 3b3a8343f7f8b1d80ac3ee811faa29fdaefde523
+  metadata.gz: 7f4539888216b2fee0e90cc5a1cffd97a20e8d6d
+  data.tar.gz: e35fc3a74a984d5f3eb0a76f4331d69fe85f5f78
 SHA512:
-  metadata.gz: 58654c3f6350bd6e016a44b94191263577cb655835882926896c553c7b8c10e79eb8b387130b71b7ced574533a0a8f9dfc47b9158263616836a67b2f5f3c8f9f
-  data.tar.gz: f3d8a493bba1fcc134496dd3f437b7ba613ba978802cd45fd74786d46adedfdaae4e1ea579148eaec983b20a8864ecc42485c32016db149e07bc40b224951259
+  metadata.gz: a90ddbf943db77a1544cf98590ba2d4fe2eb491edcfe99cbf254a2f792e88cfa6e7150bf9a71f230e5355e2d140f7a58ed19ede803a7d9db51cd06ca36bcf4db
+  data.tar.gz: 94686af4d0318e6fea58e6392ea4475dcb060a2ea00cd81af47168dca8fe5c227351f8053a72b9bdf0f0e019be16d64c9cf988e2c6bc9d33589ec2afedc6ec08

data/.simplecov

@@ -0,0 +1,3 @@
+SimpleCov.start do
+  add_filter   '/test/'
+end

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    troo (0.0.11)
+    troo (0.0.12)
       addressable
       curses (= 1.0.1)
       dispel
       json
+      launchy
       oauth
       ohm (= 1.3.2)
       ohm-contrib (= 1.2)
@@ -76,6 +77,8 @@ GEM
       minitest (>= 3.0)
     ice_nine (0.11.0)
     json (1.8.1)
+    launchy (2.4.2)
+      addressable (~> 2.3)
     listen (2.7.1)
       celluloid (>= 0.15.2)
       celluloid-io (>= 0.15.0)

data/README.md

@@ -29,6 +29,12 @@ Or install it yourself as:
 
 You will need user authentication tokens to access your Trello account.
 
+### Setup Wizard
+
+Simply run `troo wizard` and follow the on screen instructions.
+
+### Manually
+
 1) Sign in to Trello in the normal way.
 
 2) Create your developer key at Trello:
@@ -89,12 +95,6 @@ You will need user authentication tokens to access your Trello account.
 
         troo version
 
-## Todo
-
-- Fix multitude of sins.
-- Write cucumber integration tests.
-- Convert dates/times to Time.iso8601().
-
 ## Testing
 
 I've put a simple fake server together so that I'm not hitting the Trello API continuously. You can activate and use this too.
@@ -115,7 +115,7 @@ I've put a simple fake server together so that I'm not hitting the Trello API co
 4) Run `server.rb`:
 
     cd ./test/support/fake_trello
-    ruby ./server.rb
+    ./server.rb
 
 5) Have fun.
 

data/Rakefile

@@ -19,7 +19,7 @@ if File.exist?(Dir.home + '/.trooconf')
 
   Rake::Task['cucumber'].execute
 else
-  warn "\nConfiguration cannot be found, please run 'troo " \
-       "init' or './bin/troo init' first.\n"
+  warn "\nConfiguration cannot be found, please run `troo " \
+       "init` or `./bin/troo init` first.\n"
   exit(1)
 end

data/config/en.yml

@@ -1,4 +1,6 @@
 en:
+  configuration:
+    not_found: 'Configuration cannot be found, please run `troo init` or `./bin/troo init` first.'
   cli:
     add:
       board: 'Add a new board with <name>; prompts if <name> not provided.'

data/features/support/env.rb

@@ -7,10 +7,6 @@ require 'vcr'
 require 'webmock/cucumber'
 require 'mocha/api'
 
-SimpleCov.start do
-  add_filter   '/test/'
-end
-
 require_relative '../../lib/troo.rb'
 
 class CucumberError < StandardError; end

data/lib/troo.rb

@@ -5,50 +5,38 @@ require_relative 'troo/version'
 
 module Troo
   ConfigurationNotFound = Class.new(StandardError)
-  InvalidAccessToken    = Class.new(StandardError)
+  ConfigurationAborted  = Class.new(StandardError)
+  ExpiredAccessToken    = Class.new(StandardError)
   EndpointNotFound      = Class.new(StandardError)
 
-  # @param  []
   # @param  [String]
-  # @return []
+  # @param  [String]
+  # @return [Troo::Configuration]
   def self.configuration(file = Dir.home + '/.trooconf', env = 'default')
     unless File.exist?(file)
-      warn "\nConfiguration cannot be found, please run 'troo " \
-           "init' or './bin/troo init' first.\n"
-      file = configuration_path + '/trooconf.yml'
+      warn "\nConfiguration cannot be found, please run `troo " \
+           "init` or `./bin/troo init` first.\n"
+      file = root_path + '/config/trooconf.yml'
     end
 
     @configuration ||= Troo::Configuration.load(file, env)
   end
 
-  # @param  [String]
-  # @return []
-  def self.endpoints(version = 'version_1')
-    @endpoints ||= Troo::API::Endpoints
-      .load(configuration_path + '/trello_api.yml', version)
-  end
-
-  # @return []
+  # @return [TrueClass]
   def self.logger
     @logger ||= Logger
-      .new(log_path + '/troo.log').tap do |log|
+      .new(root_path + '/logs/troo.log').tap do |log|
       log.formatter = proc do |mode, time, prog, msg|
-        "#{time.iso8601} #{mode}:\n#{msg}\n"
+        "\n" + Esc.green + "#{time.iso8601}:" + Esc.reset + " #{msg}\n"
       end
     end
   end
 
+  def self.root_path
+    File.expand_path('../..', __FILE__)
+  end
+
   # RestClient.log = log_dir + '/restclient.log'
 
   Database.connect(configuration)
-
-  private
-
-  def self.configuration_path
-    File.dirname(__FILE__) + '/../config'
-  end
-
-  def self.log_path
-    File.dirname(__FILE__) + '/../logs'
-  end
 end

data/lib/troo/api/client.rb

@@ -40,15 +40,25 @@ module Troo
       end
 
       def empty_response?
-        parsed_response.empty?
+        return log(true) if parsed_response.empty?
+        false
       end
 
       def error_response?
-        response.is_a?(ErrorResponse)
+        return log(true) if response.is_a?(ErrorResponse)
+        false
       end
 
       def parsed_response
-        @parsed ||= Yajl::Parser.parse(response.body)
+        @parsed ||= Yajl::Parser.parse(response_body)
+      end
+
+      def response_body
+        data = response.body
+        File.open(filename, 'w') do |file_handle|
+          file_handle.write(data)
+        end
+        data
       end
 
       def response
@@ -69,7 +79,7 @@ module Troo
       end
 
       def urn
-        Troo.endpoints.interpolate!(endpoint, interpolation)
+        Troo::API::Endpoints.interpolate(endpoint, interpolation)
       end
 
       def missing_parameters?
@@ -80,8 +90,9 @@ module Troo
         Troo.configuration.allow_remote
       end
 
-      def log
-        Troo.logger.debug(formatted_messages) if log?
+      def log(retval = nil)
+        Troo.logger.debug("\n" + formatted_messages) if log?
+        retval
       end
 
       def log?
@@ -115,6 +126,17 @@ module Troo
           'Response' => response.body
         }
       end
+
+      def filename
+        filename = [Troo.root_path + '/tmp/', endpoint.to_s]
+        filename << '_' << external_id if external_id
+        filename << '.json'
+        filename.join
+      end
+
+      def external_id
+        interpolation[:external_id]
+      end
     end
   end
 end

data/lib/troo/api/endpoints.rb

@@ -1,45 +1,57 @@
 module Troo
   module API
     class Endpoints
-      include Virtus.value_object
-
-      values do
-        attribute :board_by_id
-        attribute :boards_all
-        attribute :card_by_id
-        attribute :cards_by_board_id
-        attribute :cards_by_list_id
-        attribute :comments_by_board_id
-        attribute :comments_by_card_id
-        attribute :comments_by_list_id
-        attribute :create_board
-        attribute :create_card
-        attribute :create_comment
-        attribute :create_list
-        attribute :list_by_id
-        attribute :lists_by_board_id
-        attribute :member_by_id
-        attribute :members_by_board_id
-        attribute :move_card_board
-        attribute :move_card_list
-      end
-
       class << self
-        # @param  [String]
-        # @param  [String]
-        # @return [Troo::API::Endpoints]
-        def load(file, version)
-          new(YAML.load_file(file)[version])
+        # @param  [Symbol]
+        # @param  [Hash]
+        # @return [String, EndpointNotFound]
+        def interpolate(endpoint, value = {})
+          new(endpoint, value).interpolate
         end
       end
 
+      # @param  [Symbol]
+      # @param  [Hash]
+      # @return [Troo::API::Endpoints]
+      def initialize(endpoint, value = {})
+        @endpoint, @value = endpoint, value
+      end
+
       # @param  [Symbol]
       # @param  [Hash]
       # @return [String, EndpointNotFound]
-      def interpolate!(endpoint, value = {})
-        return send(endpoint) % value if respond_to?(endpoint)
+      def interpolate
+        endpoints.fetch(endpoint) % value
+      rescue KeyError
         fail EndpointNotFound
       end
+
+      private
+
+      attr_reader :endpoint, :value
+
+      def endpoints
+        {
+          boards_all:           '/members/me/boards',
+          board_by_id:          '/boards/%{external_id}',
+          card_by_id:           '/cards/%{external_id}',
+          list_by_id:           '/lists/%{external_id}',
+          member_by_id:         '/members/%{external_id}',
+          cards_by_board_id:    '/boards/%{external_id}/cards',
+          cards_by_list_id:     '/lists/%{external_id}/cards',
+          comments_by_board_id: '/boards/%{external_id}/actions',
+          comments_by_card_id:  '/cards/%{external_id}/actions',
+          comments_by_list_id:  '/lists/%{external_id}/actions',
+          lists_by_board_id:    '/boards/%{external_id}/lists',
+          members_by_board_id:  '/boards/%{external_id}/members',
+          create_board:         '/boards',
+          create_card:          '/cards',
+          create_comment:       '/cards/%{external_id}/actions/comments',
+          create_list:          '/lists',
+          move_card_list:       '/cards/%{external_id}/idList',
+          move_card_board:      '/cards/%{external_id}/idBoard',
+        }
+      end
     end
   end
 end

data/lib/troo/api/response.rb

@@ -18,11 +18,16 @@ module Troo
 
       # @return [Response, ErrorResponse]
       def build
+        raise ExpiredAccessToken if expired?
         ok? ? Response.new(attributes) : ErrorResponse.new(attributes)
       end
 
       private
 
+      def expired?
+        code == '401'
+      end
+
       def ok?
         code == '200'
       end

data/lib/troo/cli/main.rb

@@ -63,6 +63,9 @@ module Troo
            'Refresh all local data or board, list or card with <id>.'
       subcommand :refresh, CLI::Refresh
 
+      desc 'wizard', 'Become the wizard.'
+      subcommand :wizard, CLI::Wizard
+
       # @param  [String]
       # @param  [String]
       # @param  [String]

data/lib/troo/cli/wizard.rb

@@ -0,0 +1,71 @@
+module Troo
+  module CLI
+    class Wizard < ThorFixes
+      package_name 'wizard'
+      default_task :start
+
+      # @return [String]
+      desc 'start', 'Run the configuration wizard to get started.'
+      def start
+        say Troo::Formatter.wordwrap(welcome_message)
+
+        proceed?
+        step_one!
+
+        say Troo::Formatter.wordwrap(step_one_message)
+
+        proceed?
+        step_two!
+
+        say 'All done! Run `troo` for further commands.'
+      end
+
+      private
+
+      def connect_url(api_key)
+        "https://trello.com/1/connect?key=#{api_key}" \
+        "&name=troo&response_type=token&scope=read,write"
+      end
+
+      def generate_url
+        'https://trello.com/1/appKey/generate'
+      end
+
+      def config
+        @config ||= Troo::Configuration.new
+      end
+
+      def proceed?
+        raise ConfigurationAborted unless yes?(user_input('Proceed?'))
+      end
+
+      def step_one!
+        Launchy.open(generate_url)
+        config.api_key   = ask(user_input('Key:'))
+        config.api_token = ask(user_input('Secret:'))
+      end
+
+      def step_two!
+        Launchy.open(connect_url(config.api_key))
+        config.api_oauth_token = ask(user_input('Token:'))
+        config.save(Dir.home + '/.trooconf', 'default')
+      end
+
+      def welcome_message
+        "Welcome to Troo. This wizard will help you configure your " \
+        "API credentials for Trello. First, you'll need to sign in " \
+        "to Trello in the normal way. Copy the API key and paste "   \
+        "when prompted, then do the same for the secret.\n"
+      end
+
+      def step_one_message
+        "Thank you. You must now allow this application to use "     \
+        "Trello account. Copy and paste the token when prompted.\n"
+      end
+
+      def user_input(value)
+        [Esc.yellow, value, Esc.reset].join
+      end
+    end
+  end
+end

data/lib/troo/configuration.rb

@@ -1,33 +1,47 @@
 module Troo
   class Configuration
-    include Virtus.value_object
+    include Virtus.model
 
-    values do
-      attribute :name
-      attribute :api_url
-      attribute :api_key
-      attribute :api_token
-      attribute :api_oauth_token
-      attribute :api_oauth_token_secret
-      attribute :database
-      attribute :allow_remote, Boolean, default: true
-      attribute :logs,         Boolean, default: false
-    end
+    attribute :api_key
+    attribute :api_token
+    attribute :api_oauth_token
+    attribute :api_oauth_token_secret
+    attribute :allow_remote, Boolean, default: true
+    attribute :logs,         Boolean, default: false
+    attribute :name,         String,  default: 'My Default Configuration'
+    attribute :api_url,      String,  default: 'https://api.trello.com/1'
+    attribute :database,     Integer, default: 1
 
     class << self
-      # @param  []
       # @param  [String]
-      # @return []
+      # @param  [String]
+      # @return [Troo::Configuration]
       def load(file, env)
         new(YAML.load_file(file)[env])
       end
     end
 
-    # @return []
+    # @param  [String]
+    # @param  [String]
+    # @return [TrueClass, FalseClass]
+    def save(file, env)
+      return true if File.open(file, 'w') do |file|
+        file.write configuration_yaml(env)
+      end
+      false
+    end
+
+    # @return [String]
     def view
       attributes.map do |label, value|
         Preference.view(label: label, value: value)
       end.join("\n")
     end
+
+    private
+
+    def configuration_yaml(env = 'default')
+      { env => self.attributes }.to_yaml
+    end
   end
 end