troo 0.0.11 → 0.0.12

data/lib/troo/debug.rb

@@ -18,4 +18,13 @@ module Troo
       RubyProf::CallStackPrinter.new(result).print(file)
     end
   end
+
+  def self.trace
+    trace = TracePoint.new(:call) do |tp|
+      if tp.defined_class.to_s.match(/Troo/)
+        Troo.logger.debug [tp.defined_class.to_s, tp.method_id.to_s].join(' ')
+      end
+    end
+    trace.enable
+  end
 end

data/lib/troo/decorators/resource.rb

@@ -39,7 +39,7 @@ module Troo
         end
       end
 
-      # @return []
+      # @return [String]
       def id
         (klass.type == :card) ? klass.short_id : klass.id
       end
@@ -61,12 +61,12 @@ module Troo
         (klass.name && klass.name.chomp) || 'N/A'
       end
 
-      # @return []
+      # @return [Troo::Decorators::Resource]
       def board
         klass.board.decorator
       end
 
-      # @return []
+      # @return [Troo::Decorators::Resource]
       def list
         klass.list.decorator
       end
@@ -104,7 +104,11 @@ module Troo
 
       # @return [String]
       def username
-        ['@', klass.member.username].join
+        if klass.type == :member
+          ['@', klass.username].join
+        else
+          ['@', klass.member.username].join
+        end
       end
 
       # @return [String]

data/lib/troo/launcher.rb

@@ -10,27 +10,37 @@ module Troo
                          stdout = STDOUT,
                          stderr = STDERR,
                          kernel = Kernel)
-      @argv = argv
-      @stdin = stdin
-      @stdout = stdout
-      @stderr = stderr
-      @kernel = kernel
+      @argv      = argv
+      @stdin     = stdin
+      @stdout    = stdout
+      @stderr    = stderr
+      @kernel    = kernel
+      @exit_code = 1
     end
 
-    # @return []
+    # @return [String, NilClass]
     def execute!
       $stdin, $stdout, $stderr = @stdin, @stdout, @stderr
       pad { Troo::CLI::Main.start(@argv) }
-      @kernel.exit(0)
-    rescue Errno::ENOENT
-      pad { puts "Configuration cannot be found, please run 'troo init'" \
-                 " first." }
-      @kernel.exit(1)
+      @exit_code = 0
+    rescue ConfigurationNotFound
+      pad do
+        puts "Configuration cannot be found, please run " \
+             "`troo wizard` for help, or 'troo init' to manually " \
+             "configure."
+      end
+    rescue ConfigurationAborted
+      pad { puts 'Configuration wizard aborted.' }
     rescue Redis::CannotConnectError
       pad { puts 'Cannot connect to Redis database.' }
-      @kernel.exit(1)
+    rescue ExpiredAccessToken
+      pad do
+        puts "Your Trello access token has expired, please run " \
+             "`troo wizard` for help, or manually renew."
+      end
     ensure
       $stdin, $stdout, $stderr = STDIN, STDOUT, STDERR
+      @kernel.exit(@exit_code)
     end
 
     private

data/lib/troo/models/board.rb

@@ -5,8 +5,8 @@ module Troo
 
     attribute :name
     attribute :description
-    attribute :default, Type::Boolean
-    attribute :closed, Type::Boolean
+    attribute :default,     Type::Boolean
+    attribute :closed,      Type::Boolean
     attribute :external_id
     attribute :short_id
 

data/lib/troo/models/card.rb

@@ -10,8 +10,8 @@ module Troo
     attribute :external_member_ids, Type::Array
     attribute :position
     attribute :last_activity_date
-    attribute :default, Type::Boolean
-    attribute :closed, Type::Boolean
+    attribute :default,             Type::Boolean
+    attribute :closed,              Type::Boolean
     attribute :external_board_id
     attribute :external_list_id
     attribute :external_id

data/lib/troo/models/member.rb

@@ -31,7 +31,7 @@ module Troo
     # @param  [Hash]
     # @return []
     def decorator(options = {})
-      Decorators::Member.new(self, options)
+      Decorators::Resource.new(self, options)
     end
 
     # @param  [Hash]

data/lib/troo/models/refresh.rb

@@ -8,13 +8,13 @@ module Troo
     index :last_performed_at
 
     class << self
-      # @return []
+      # @return [Troo::Refresh]
       def completed!
         all.map { |record| record.delete }
         create(last_performed_at: Time.now.to_s)
       end
 
-      # @return []
+      # @return [String, NilClass]
       def last_performed_at
         first ? first.last_performed_at : nil
       end

data/lib/troo/remote/list.rb

@@ -35,7 +35,7 @@ module Troo
         []
       end
 
-      # @return []
+      # @return [Troo::List]
       def local_model
         Troo::List
       end

data/lib/troo/remote/member.rb

@@ -58,7 +58,7 @@ module Troo
         []
       end
 
-      # @return []
+      # @return [Troo::Member]
       def local_model
         Troo::Member
       end

data/lib/troo/remote/persistence/board.rb

@@ -7,33 +7,29 @@ module Troo
           # @param  [String, NilClass]
           # @return []
           def with(name, description = nil)
-            new(name, description).perform
+            new(name, description).create_local
           end
         end
 
         # @param  [String]
         # @param  [String, NilClass]
-        # @return []
+        # @return [Troo::Remote::Persistence::Board]
         def initialize(name, description = nil)
           @name        = name
           @description = description
         end
 
         # @return []
-        def perform
-          create_local
-        end
-
-        private
-
-        attr_reader :name, :description
-
         def create_local
           return Troo::Persistence::Local
             .with_collection(resource).first if any?
           false
         end
 
+        private
+
+        attr_reader :name, :description
+
         def any?
           resource.any?
         end

data/lib/troo/remote/persistence/card.rb

@@ -8,14 +8,14 @@ module Troo
           # @param  [String, NilClass]
           # @return []
           def with(external_list_id, name = nil, description = nil)
-            new(external_list_id, name, description).perform
+            new(external_list_id, name, description).create_local
           end
         end
 
         # @param  [String]
         # @param  [String, NilClass]
         # @param  [String, NilClass]
-        # @return []
+        # @return [Troo::Remote::Persistence::Card]
         def initialize(external_list_id, name = nil, description = nil)
           @external_list_id = external_list_id
           @name             = name
@@ -23,20 +23,16 @@ module Troo
         end
 
         # @return []
-        def perform
-          create_local
-        end
-
-        private
-
-        attr_reader :external_list_id, :name, :description
-
         def create_local
           return Troo::Persistence::Local
             .with_collection(resource).first if any?
           false
         end
 
+        private
+
+        attr_reader :external_list_id, :name, :description
+
         def any?
           resource.any?
         end

data/lib/troo/remote/persistence/comment.rb

@@ -7,33 +7,29 @@ module Troo
           # @param  []
           # @return []
           def with(external_card_id, comment)
-            new(external_card_id, comment).perform
+            new(external_card_id, comment).create_local
           end
         end
 
         # @param  [String]
         # @param  []
-        # @return []
+        # @return [Troo::Remote::Persistence::Comment]
         def initialize(external_card_id, comment)
           @external_card_id = external_card_id
           @comment          = comment
         end
 
         # @return []
-        def perform
-          create_local
-        end
-
-        private
-
-        attr_reader :external_card_id, :comment
-
         def create_local
           return Troo::Persistence::Local
             .with_collection(resource).first if any?
           false
         end
 
+        private
+
+        attr_reader :external_card_id, :comment
+
         def any?
           resource.any?
         end

data/lib/troo/remote/persistence/list.rb

@@ -7,33 +7,29 @@ module Troo
           # @param  [String]
           # @return []
           def with(external_board_id, name)
-            new(external_board_id, name).perform
+            new(external_board_id, name).create_local
           end
         end
 
         # @param  [String]
         # @param  [String]
-        # @return []
+        # @return [Troo::Remote::Persistence::List]
         def initialize(external_board_id, name)
           @external_board_id = external_board_id
           @name              = name
         end
 
         # @return []
-        def perform
-          create_local
-        end
-
-        private
-
-        attr_reader :external_board_id, :name
-
         def create_local
           return Troo::Persistence::Local
             .with_collection(resource).first if any?
           false
         end
 
+        private
+
+        attr_reader :external_board_id, :name
+
         def any?
           resource.any?
         end

data/lib/troo/remote/persistence/move_card.rb

@@ -11,14 +11,14 @@ module Troo
                    external_list_id,
                    external_board_id = nil)
             new(external_card_id, external_list_id, external_board_id)
-              .perform
+              .update_cards
           end
         end
 
         # @param  [String]
         # @param  [String]
         # @param  [String, NilClass]
-        # @return []
+        # @return [Troo::Remote::Persistence::MoveCard]
         def initialize(external_card_id,
                        external_list_id,
                        external_board_id = nil)
@@ -28,8 +28,10 @@ module Troo
         end
 
         # @return []
-        def perform
-          update_cards
+        def update_cards
+          return Troo::Persistence::Local
+            .with_collection(resource).first if any?
+          false
         end
 
         private
@@ -38,12 +40,6 @@ module Troo
                     :external_list_id,
                     :external_board_id
 
-        def update_cards
-          return Troo::Persistence::Local
-            .with_collection(resource).first if any?
-          false
-        end
-
         def any?
           resource.any?
         end

data/lib/troo/troo.rb

@@ -3,8 +3,9 @@ require 'date'
 require 'dispel'
 require 'erb'
 require 'fileutils'
-require 'logger'
 require 'json'
+require 'launchy'
+require 'logger'
 require 'net/http'
 require 'oauth'
 require 'ohm'
@@ -44,7 +45,6 @@ require_relative 'remote/persistence/list'
 require_relative 'remote/persistence/move_card'
 
 require_relative 'decorators/resource'
-require_relative 'decorators/member'
 
 require_relative 'presentation/formatter'
 require_relative 'presentation/sentence'
@@ -87,6 +87,7 @@ require_relative 'cli/add'
 require_relative 'cli/default'
 require_relative 'cli/refresh'
 require_relative 'cli/show'
+require_relative 'cli/wizard'
 require_relative 'cli/main'
 
 require_relative 'launcher'

data/lib/troo/version.rb

@@ -1,3 +1,3 @@
 module Troo
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

data/test/lib/troo/api/endpoints_test.rb

@@ -4,42 +4,32 @@ module Troo
   module API
     describe Endpoints do
       let(:described_class) { Endpoints }
-      let(:file) {}
-      let(:version) {}
-      let(:endpoints) { { board_by_id: '/boards/%{id}' } }
 
-      before do
-        YAML.stubs(:load_file).returns(endpoints)
-      end
-
-      describe '.load' do
-        subject { described_class.load(file, version) }
-
-        it 'returns a new instance of the class' do
-          subject.must_be_instance_of(Endpoints)
-        end
-      end
-
-      describe '#interpolate!' do
+      describe '#interpolate' do
         let(:endpoint) { :board_by_id }
-        let(:value)    { { id: '20001' } }
+        let(:value)    { { external_id: '20001' } }
 
-        subject do
-          described_class.new(endpoints)
-            .interpolate!(endpoint, value)
-        end
+        subject { described_class.interpolate(endpoint, value) }
 
         context 'when the endpoint exists' do
           it 'returns the interpolated endpoint' do
             subject.must_equal('/boards/20001')
           end
+
+          context 'but the endpoint does not need interpolation' do
+            let(:endpoint) { :boards_all }
+
+            it 'returns the normal endpoint' do
+              subject.must_equal('/members/me/boards')
+            end
+          end
         end
 
         context 'when the endpoint does not exist' do
           let(:endpoint) { :wrong_endpoint }
 
           it 'raises an exception' do
-            proc { subject }.must_raise(EndpointNotFound)
+            proc { subject }.must_raise(Troo::EndpointNotFound)
           end
         end
       end