ki_trello 0.0.3 → 0.0.4

data/bin/ki_trello

@@ -17,12 +17,24 @@ require 'rubygems'
 require 'gli'
 require 'ki_trello'
 require 'colored'
-include GLI
+include GLI::App
 
 program_desc 'A Kiseru client for Trello'
 
 version KiTrello::VERSION
 
+def find_input(filename)
+  if filename.nil? || filename.empty?
+    if $stdin.tty?
+      nil
+    else
+      $stdin
+    end
+  else
+    File.open(filename,'r')
+  end
+end
+
 desc 'Initialise config files'
 command :init do |c|
   c.action do |global_options,options,args|
@@ -58,11 +70,21 @@ desc 'Create new card'
 command :new_card do |c|
   c.desc "The list ID"
   c.flag [:list]
+  c.desc "Interactive mode"
+  c.switch [:i]
+  c.arg_name 'file'
   c.action do |global_options, options, args|
-    received_json = $stdin.read
-    unless list_id = options[:list]
-      list_id = MultiJson.load(received_json)['idList']
+    input = find_input(args.first)
+    help_now!(nil) unless input
+    received_json = input.read
+
+    list_id = options[:list]
+    if options[:i] && list_id.nil?
+      board_id = KiTrello::Interactive.new.select_board("Which board?")
+      list_id = KiTrello::Interactive.new.select_list(board_id, "Which list?")
     end
+
+    list_id ||= MultiJson.load(received_json)['idList']
     command = KiTrello::Command.new
     command.create_card(received_json, { :list => list_id })
   end
@@ -72,12 +94,12 @@ desc 'List lists in board'
 command :lists do |c|
   c.desc "The board ID"
   c.flag [:board]
-  c.desc "Interactive Mode"
+  c.desc "Interactive mode"
   c.switch [:i]
   c.action do |global_options, options, args|
     unless board_id = options[:board]
       if options[:i]
-        board_id = KiTrello::Interactive.select_board("\n  Which board would you like to view?")
+        board_id = KiTrello::Interactive.new.select_item("Which board?")
       else
       end
     end
@@ -86,4 +108,4 @@ command :lists do |c|
   end
 end
 
-exit GLI.run(ARGV)
+exit run(ARGV)

data/ki_trello.gemspec

@@ -18,9 +18,10 @@ Gem::Specification.new do |gem|
   gem.add_dependency('colored', '~> 1.2.0')
   gem.add_dependency('faraday', '~> 0.8.2')
   gem.add_dependency('faraday_middleware', '~> 0.8.8')
-  gem.add_dependency('gli', '~> 1.6.0')
+  gem.add_dependency('gli', '~> 2.2.1')
   gem.add_dependency('multi_json', '~> 1.3.6')
   gem.add_dependency('json_pure', '~> 1.7.4')
+  gem.add_dependency('map', '~> 6.2.0')
 
   gem.add_development_dependency('debugger', '~> 1.2.0')
   gem.add_development_dependency('rake', '~> 0.9.2')

data/lib/ki_trello/interactive.rb

@@ -1,18 +1,28 @@
-# TODO - this is duplicated in ki_pivotal
+require 'map'
+require 'colored'
+
+# TODO - This should move up into Kiseru gem
 
 module KiTrello
 
   class Interactive
-  # "Resistance is futile!", "We will get an answer!"
-    def self.repeatedly_ask(question)
+
+    def initialize(input=$stdin, output=$stderr)
+      @input = input
+      @output = output
+    end
+
+    # "Resistance is futile!", "We will get an answer!"
+    def repeatedly_ask(question)
       response = ""
       while response == ""
-        response = simple_query(question)
+        response = simple_query("\n  "+question)
       end
       response
     end
-  # "We have ways of making you talk!"
-    def self.repeatedly_choose_from(things, question)
+
+    # "We have ways of making you talk!"
+    def repeatedly_choose_from(things, question)
       index = nil
       while index.nil?
         index = choose_from_many(things, question)
@@ -20,77 +30,60 @@ module KiTrello
       index
     end
 
-    def self.choose_from_many(things, question)
-      $stderr.puts "\n  "+question
+    def choose_from_many(things, question)
+      @output.puts "\n  "+question.to_s
 
-      things.each_with_index { |thing, index| $stderr.puts "  #{index+1} ".green + " #{thing}" }
+      things.each_with_index do |thing, index|
+        @output.puts "  #{index+1} ".green + " #{thing}"
+      end
 
-      index = ( (simple_query( "Enter an index (#{(1..things.size)})" ).to_i) - 1 )
+      index = ( (simple_query( "(#{(1..things.size)})").to_i) - 1 )
       index = ( index >= 0 && index < things.size ) ? index : nil
     end
 
-    def self.simple_query(prompt)
+    def simple_query(prompt)
       if prompt.nil?
-        $stderr.print "\n> "
+        @output.print "\n> "
       else
-        $stderr.print "\n  #{prompt}: "
+        @output.print "\n  #{prompt}: "
       end
-      $stdin.gets.chomp
+      @input.gets.chomp
     end
 
-    def self.select_board(prompt)
-      boards = MultiJson.load(KiTrello::Command.new.boards)
-      if boards.size > 1
-        index = repeatedly_choose_from(boards.map { |b| b['name'] }, prompt)
-      else
-        index = 0
-      end
-      $stderr.puts "\n Chosen board is #{boards[index]['name']}"
-      boards[index]['id']
+    def select_item(items, prompt=nil, input=$stdin, output=$stdout, err=$stderr)
+      items = mapify(items)
+      index = get_index(items, prompt)
+      return index if index.nil?
+      items[index]['id']
     end
 
-    def self.select_story(project_id, prompt)
-      stories = MultiJson.load(KiPivotal::Api.new.stories_in_project(project_id))
-
-      if stories.size > 1
-        index = repeatedly_choose_from(stories.map { |p| p['name'] }, prompt)
-      else
-        index = 0
-      end
+    def select_list(board_id, prompt)
+      lists = MultiJson.load(KiTrello::Command.new.lists(board_id))
+      select_item(lists, prompt)
+    end
 
-        $stderr.puts "\n  Chosen story is '#{stories[index]['name']}'"
-        stories[index]['id']
+    def select_board(prompt)
+      boards = MultiJson.load(KiTrello::Command.new.boards)
+      select_item(boards, prompt)
     end
 
-    def self.select_project(prompt)
-      projects = MultiJson.load(KiPivotal::Api.new.projects)
+    private
+
+    def mapify(items)
+      Array(items).map { |x| Map(x) }
+    end
 
-      if projects.size > 1
-        index = repeatedly_choose_from(projects.map { |p| p['name'] }, prompt)
+    def get_index(items, prompt)
+      case items.size
+      when 0
+        return nil
+      when 1
+        0
       else
-        index = 0
+        repeatedly_choose_from(items.map(&:name), prompt)
       end
-
-        $stderr.puts "\n  Chosen project is '#{projects[index]['name']}'"
-        projects[index]['id']
     end
 
-    def self.new_story
-      name = repeatedly_ask("Name of story")
-
-      description = repeatedly_ask("Description of story")
-
-      types = ["bug","feature","release","chore"]
-      type = types[repeatedly_choose_from(types, "What type of story is this?")]
-
-      {
-        name: name,
-        description: description,
-        story_type: type,
-        requested_by: 'Kiseru',
-        ki_type: 'pivotal_story'
-      }.to_json
-    end
   end
 end
 

data/lib/ki_trello/session.rb

@@ -32,13 +32,12 @@ module KiTrello
     end
 
     def card(card_id)
-      response = connection.get("/1/cards/#{card_id}", auth_params)
+      response = connection.get("/1/cards/#{card_id}", auth_params.merge(:checklists => 'all'))
 
       case response.status
       when 200
-        response.body
+        response.body.merge('ki_type' => 'trello_card')
       else
-        debugger
         raise SessionError, "Unhandled status code #{response.status}: #{response.body}"
       end
     end

data/lib/ki_trello/version.rb

@@ -1,3 +1,3 @@
 module KiTrello
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/integration/command_spec.rb

@@ -49,6 +49,7 @@ describe Command do
 
     card = as_data(out)
     card['name'].should == "Test card 001"
+    card['ki_type'].should == "trello_card"
 
     # Sorry for this test, not sure how to get the short name
     out, err = with_command do |command|
@@ -66,6 +67,20 @@ describe Command do
     card['name'].should == "Test card 001"
   end
 
+  it "gets checklists with card", :vcr do
+    out, err = with_command do |command|
+      command.get_card("503b9388a2a5a25554bae2e7")
+    end
+
+    card = as_data(out)
+    checklists = card['checklists']
+    checklists.length.should == 2
+    checklists.first['name'].should == 'Checklist 1'
+    checklists.first['checkItems'].length.should == 2
+    checklists.last['name'].should == 'Checklist 2'
+    checklists.last['checkItems'].length.should == 1
+  end
+
   it "creates card in board", :vcr do
     json =<<-JSON
 {

data/spec/spec_helper.rb

@@ -38,3 +38,16 @@ RSpec.configure do |config|
   #     --seed 1234
   config.order = 'random'
 end
+
+# TODO - should move to Kiseru
+module Helpers
+  def with_io(input_string)
+    input = StringIO.new(input_string.to_s)
+    error = StringIO.new
+    output = StringIO.new
+    yield input, output, error
+    output.rewind
+    error.rewind
+    [output.read, error.read]
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ki_trello
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-20 00:00:00.000000000 Z
+date: 2012-09-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70093973076780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.0
+  version_requirements: *70093973076780
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70093973076280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,15 +32,10 @@ dependencies:
         version: 0.8.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.2
+  version_requirements: *70093973076280
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70093973075700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,31 +43,21 @@ dependencies:
         version: 0.8.8
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.8
+  version_requirements: *70093973075700
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70093973074960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 2.2.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.0
+  version_requirements: *70093973074960
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70093973074020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -85,15 +65,10 @@ dependencies:
         version: 1.3.6
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.6
+  version_requirements: *70093973074020
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70093973073140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,15 +76,21 @@ dependencies:
         version: 1.7.4
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *70093973073140
+- !ruby/object:Gem::Dependency
+  name: map
+  requirement: &70093973051180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.4
+        version: 6.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70093973051180
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70093973050440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -117,15 +98,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.0
+  version_requirements: *70093973050440
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70093973049960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,15 +109,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2
+  version_requirements: *70093973049960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70093973049360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -149,15 +120,10 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.11.0
+  version_requirements: *70093973049360
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70093973048680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,15 +131,10 @@ dependencies:
         version: 0.6.4
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.4
+  version_requirements: *70093973048680
 - !ruby/object:Gem::Dependency
   name: test-construct
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70093973047960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -181,15 +142,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.0
+  version_requirements: *70093973047960
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70093973047340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,15 +153,10 @@ dependencies:
         version: 2.2.4
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.4
+  version_requirements: *70093973047340
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70093973046800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -213,12 +164,7 @@ dependencies:
         version: 1.8.9
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.9
+  version_requirements: *70093973046800
 description: A Kiseru client for Trello
 email:
 - ben@freeagent.com
@@ -263,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A Kiseru client for Trello