trellor 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a75332839fc3f9a73606e8bc3edbe10a0df2e72
-  data.tar.gz: 99ea0ab3625ef2894cbdb20ec27368072de0b4ce
+  metadata.gz: 85d97d017e9e202db49b8a9a4ec8ff05472fc3e0
+  data.tar.gz: 7de26825b22aa66f3086d983802cf4186301048d
 SHA512:
-  metadata.gz: e49e48215f237b10f0e6c9a2f2410d72dabccd96b656139c864694365009a4337b825818090c736243738b2a6def32c12f81d0959abd00bccdf2977facce1dce
-  data.tar.gz: 5344faf45db12a13166d019b51b2ec72f29fbd0e3fc82325d18991a0724a59f6d0f2bf7e71bdf5e9bf1e52d0ab39df730b94c4128b85fb52a4d37817c526851e
+  metadata.gz: 737f9fc421e8d2af416001014b368d2288a6583f644177c2fbf7e71fa5b4d2e3fb326f39e294f98e2fbf1a8e8c0765f511ccd3860c8da8f3daf7c9dfeb724330
+  data.tar.gz: 1ffb79c6a4f311dd524ebb1b8b30842d67927eb7fe59be2be436762704a437073a30fe201039e03c19b9da97cd3e14d7edfa13ee4b1ed484fc940228dd8ca6d8

data/README.md

@@ -1,6 +1,6 @@
 # Trellor
 
-Gem to read and write to Trello, plus a terminal interface.
+Terminal interface to Trello.
 
 ## Installation
 

data/lib/cli.rb

@@ -15,11 +15,11 @@ module Trellor
       end
 
       if webapi?
-        puts 'webapi'
-        require_relative 'webapi'
-        run TrellorWebapi
-        puts 'done?'
-        sleep 10
+        require_relative 'web_trellor'
+        web = WebTrellor.new
+        web.be_verbose = true if @opts[:verbose]
+        web.ensure_webapp_is_running
+        exit 0
       end
 
       if cache?
@@ -42,6 +42,7 @@ module Trellor
           verbose_log('using webapi')
           require_relative 'web_trellor'
           web = WebTrellor.new
+          web.be_verbose = true if @opts[:verbose]
           web.ensure_webapp_is_running
           web
         end

data/lib/trellor.rb

@@ -52,7 +52,6 @@ module Trellor
       card.name = name
       card.desc = descript if descript
       card.save
-      # card_names(board_name, list_name)
     end
     def archive_card(board_name, list_name, name)
       card = find_card(board_name, list_name, name)
@@ -74,17 +73,15 @@ module Trellor
     def board(name)
       boards   # to get verbose log ordering correct
       verbose_log('getting board', name)
-      name = name.downcase
-      boards.detect{ |board| board.name.downcase.start_with?(name) }
+      name = Regexp.new(name, Regexp::IGNORECASE)
+      boards.detect{ |board| name.match(board.name) }
     end
 
     def list(board_name, list_name)
       this_board = board(board_name)
       verbose_log('   getting list', board_name, list_name)
-      list_name = list_name.downcase
-      this_board.lists.detect do |list|
-        list.name.downcase.start_with?(list_name)
-      end
+      name = Regexp.new(list_name, Regexp::IGNORECASE)
+      this_board.lists.detect{ |list| name.match(list.name) }
     end
 
     def cards(board_name, list_name)

data/lib/trellor/version.rb

@@ -1,3 +1,3 @@
 module Trellor
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

data/lib/web_trellor.rb

@@ -3,6 +3,7 @@
 require 'trello'
 require 'net/http'
 require 'pathname'
+require 'addressable/uri'
 require_relative "trellor/version"
 
 module Trellor
@@ -15,38 +16,45 @@ module Trellor
       fail unless v
     rescue
       puts "The background webapp wasn't running. Will run it now."
+      verbose_log "The background webapp wasn't running. Will run it now."
       run_webapp
     end
 
     def run_webapp
       path = Pathname.new(__FILE__).parent.parent
       cmd = "cd '#{path}' && ruby lib/webapi.rb &> /dev/null"
+      verbose_log cmd
       job = fork do
         exec cmd
       end
       # give webapp time to run before returning
-      (1..15).each do |n|
+      (1..30).each do |n|
+        verbose_log '.'
         sleep 0.1
-        return if get_version
+        ver = get_version
+        return if ver and ver!=''
       end
       Process.detach(job)
     end
 
     def get_version
-      response = get_http('/version', nil, false)
+      response = get_http('/version', nil, nil, false)
       response.body
     rescue
       nil
     end
 
-    def get_http(url, timeout=nil, show_error=true)
-      uri = URI("#{site}#{url}")
+    def get_http(url, data=nil, timeout=nil, show_error=true)
+      uri = Addressable::URI.parse("#{site}#{url}")
       http = Net::HTTP.new uri.host, uri.port
       http.open_timeout = default_open_timeout
       http.read_timeout = timeout || default_read_timeout
       request = Net::HTTP::Get.new(uri.request_uri)
       # request.basic_auth 'trellor', password if password
-      http.request(request)
+      request.set_form_data data if data
+      response = http.request(request)
+      verbose_log response.code, response.body
+      response
     rescue Exception => e
       $stderr.puts "ERROR in get_http(#{url})" if show_error
       raise e
@@ -65,7 +73,9 @@ module Trellor
       # request.basic_auth 'trellor', password if password
 
       request.set_form_data data
-      http.request(request)
+      response = http.request(request)
+      verbose_log response.code, response.body
+      response
     rescue Exception => e
       $stderr.puts "ERROR in post_http(#{url})"
       raise e
@@ -102,11 +112,11 @@ module Trellor
     end
 
     def list_names(board_name)
-      JSON.parse(get_http("/boards/#{board_name}/lists").body)
+      JSON.parse(get_http("/boards", {board_name: board_name}).body)
     end
 
     def card_names(board_name, list_name)
-      JSON.parse(get_http("/boards/#{board_name}/lists/#{list_name}/cards").body)
+      JSON.parse(get_http("/boards", {board_name: board_name, list_name: list_name}).body)
     end
 
     def create_card(board_name, list_name, name, descript=nil)

data/lib/webapi.rb

@@ -41,23 +41,16 @@ get '/version' do
 end
 
 get '/boards' do
-  boards = trellor.board_names
-  boards.to_json
-end
-
-get '/boards/:board_name/lists' do |board_name|
-  lists = trellor.list_names(board_name)
-  lists.to_json
-end
-
-get '/boards/:board_name/lists/:list_name/cards' do |board_name, list_name|
-  cards = trellor.list(board_name,list_name).cards.collect{ |card| card.name }
-  cards.to_json
-end
-
-get '/bbboards/:board_name/lists/:list_name/cards/:card_name' do
-  card = trellor.list(params['board_name'],params['list_name'],params['card_name'])
-  card.to_json
+  if params[:list_name]
+    cards = trellor.list(params[:board_name],params[:list_name]).cards.collect{ |card| card.name }
+    cards.to_json
+  elsif params[:board_name]
+    lists = trellor.list_names(params[:board_name])
+    lists.to_json
+  else
+    boards = trellor.board_names
+    boards.to_json
+  end
 end
 
 post '/boards/:board_name/lists/:list_name/cards' do |board_name, list_name|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trellor
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Brian Murphy-Dye
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-03 00:00:00.000000000 Z
+date: 2015-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-trello