trellor 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b0899d981643ca3ce03274a849a5c20e8944206
-  data.tar.gz: bdb6b7568c5ee346e3bfb5db3caf6bbc70560d59
+  metadata.gz: 1a75332839fc3f9a73606e8bc3edbe10a0df2e72
+  data.tar.gz: 99ea0ab3625ef2894cbdb20ec27368072de0b4ce
 SHA512:
-  metadata.gz: c5ab069eec67696f8445417d67b024d5e67a58e65925629821d566f089819fc5128c8abe6c2f1ea04dc3c84240082a45685aabfd1c7ab0502280d31079e131e9
-  data.tar.gz: 12d66860ee5e25fc2ccbc37d1597695dfcbb7b4b00d270528ce6b0fd286d0a4431098c8de71df42ad9d069e785ff2f0e5e9dda4ae1de8743be30c34bf03e6dce
+  metadata.gz: e49e48215f237b10f0e6c9a2f2410d72dabccd96b656139c864694365009a4337b825818090c736243738b2a6def32c12f81d0959abd00bccdf2977facce1dce
+  data.tar.gz: 5344faf45db12a13166d019b51b2ec72f29fbd0e3fc82325d18991a0724a59f6d0f2bf7e71bdf5e9bf1e52d0ab39df730b94c4128b85fb52a4d37817c526851e

data/lib/cli.rb

@@ -7,6 +7,7 @@ module Trellor
       @opts = Trollop::options do
         banner "Usage: trellor [boardname [listname [cardname [description]]]]"
         version "trellor #{VERSION}"
+        opt :archive, 'Archive a card', short: '-a'
         opt :cache, 'Cache (or re-cache)', short: '-c'
         opt :verbose, 'Run verbosely', short: '-v'
         opt :webapi, 'Run webapi', short: '-w'
@@ -89,22 +90,18 @@ module Trellor
       if board_name.nil?
         puts "Boards:", '-'*50
         trellor.board_names.each{ |name| puts name }
-        # trellor.boards.each{ |board| puts board.name }
+      elsif list_name.nil?
+        puts "Lists for Board: #{board_name}", '-'*50
+        trellor.list_names(board_name).each{ |name| puts name }
+      elsif card_name.nil?
+        puts "Cards for List: #{board_name}.#{list_name}", '-'*50
+        trellor.card_names(board_name, list_name).each{ |name| puts name }
+      elsif archive?
+        trellor.archive_card(board_name, list_name, card_name)
+        trellor.card_names(board_name, list_name).each{ |name| puts name }
       else
-        if list_name.nil?
-          # board = trellor.board(board_name)
-          puts "Board: #{board_name}", '-'*50
-          trellor.list_names(board_name).each{ |name| puts name }
-          # board.lists.each{ |list| puts list.name }
-        elsif card_name.nil?
-          # list = trellor.list(board_name, list_name)
-          puts "List: #{board_name}.#{list_name}", '-'*50
-          trellor.card_names(board_name, list_name).each{ |name| puts name }
-          # list.cards.each{ |card| puts card.name }
-        else
-          card_names = trellor.create_card(board_name, list_name, card_name, descript)
-          card_names.each{ |name| puts name }
-        end
+        trellor.create_card(board_name, list_name, card_name, descript)
+        trellor.card_names(board_name, list_name).each{ |name| puts name }
       end
     end
 
@@ -116,6 +113,10 @@ module Trellor
       @opts[:webapi]
     end
 
+    def self.archive?
+      @opts[:archive]
+    end
+
     def self.cache?
       @opts[:cache]
     end

data/lib/trellor.rb

@@ -52,7 +52,11 @@ module Trellor
       card.name = name
       card.desc = descript if descript
       card.save
-      card_names(board_name, list_name)
+      # card_names(board_name, list_name)
+    end
+    def archive_card(board_name, list_name, name)
+      card = find_card(board_name, list_name, name)
+      card.close!
     end
 
 
@@ -88,9 +92,10 @@ module Trellor
       list(board_name, list_name).cards
     end
 
-    def card(board_name, list_name, card_name)
+    def find_card(board_name, list_name, card_name)
+      card_name = card_name.downcase
       list(board_name, list_name).cards.detect do |card|
-        card.name==card_name
+        card.name.downcase.start_with?(card_name)
       end
     end
   end

data/lib/trellor/version.rb

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

data/lib/web_trellor.rb

@@ -10,24 +10,36 @@ module Trellor
     attr_accessor :be_verbose
 
     def ensure_webapp_is_running
-      fail unless VERSION == get_version
+      v = get_version
+      $stderr.puts "Warning: this version is #{VERSION} but the webapp version is #{v}. You may want to kill the older webapp." unless VERSION == v
+      fail unless v
     rescue
       puts "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"
       job = fork do
         exec cmd
       end
+      # give webapp time to run before returning
+      (1..15).each do |n|
+        sleep 0.1
+        return if get_version
+      end
       Process.detach(job)
-      sleep 1.0   # give webapp time to run before returning
     end
 
     def get_version
-      response = get_http('/version')
+      response = get_http('/version', nil, false)
       response.body
+    rescue
+      nil
     end
 
-    def get_http(url, timeout=nil)
+    def get_http(url, timeout=nil, show_error=true)
       uri = URI("#{site}#{url}")
       http = Net::HTTP.new uri.host, uri.port
       http.open_timeout = default_open_timeout
@@ -36,7 +48,7 @@ module Trellor
       # request.basic_auth 'trellor', password if password
       http.request(request)
     rescue Exception => e
-      $stderr.puts "ERROR in get_http(#{url})"
+      $stderr.puts "ERROR in get_http(#{url})" if show_error
       raise e
     end
 
@@ -98,9 +110,12 @@ module Trellor
     end
 
     def create_card(board_name, list_name, name, descript=nil)
-      JSON.parse(post_http("/boards/#{board_name}/lists/#{list_name}/cards", {card_name: name}).body)
+      JSON.parse(post_http("/boards/#{board_name}/lists/#{list_name}/cards", {card_name: name, descript: descript}).body)
     end
 
+    def archive_card(board_name, list_name, name)
+      JSON.parse(post_http("/boards/#{board_name}/lists/#{list_name}/cards", {card_name: name, archive: true}).body)
+    end
 
 
 

data/lib/webapi.rb

@@ -3,14 +3,35 @@ require 'json'
 require_relative 'trellor/version'
 require_relative 'trellor'
 
+
 module Trellor
   class TrellorWebapi < Sinatra::Base
-    get '/' do
-      "Hello, world!"
+    # enable error handler even in development mode
+    set :show_exceptions, :after_handler
+
+    not_found do
+      'no such path'
+    end
+
+    error do
+      'had an error'
     end
+
   end
 end
 
+
+set :show_exceptions, false
+
+not_found do
+  'no such path'
+end
+
+error do
+  'had an error'
+end
+
+
 def trellor
   Trellor::Trellor.singleton
 end
@@ -40,13 +61,14 @@ get '/bbboards/:board_name/lists/:list_name/cards/:card_name' do
 end
 
 post '/boards/:board_name/lists/:list_name/cards' do |board_name, list_name|
-  card = Trello::Card.new
-  card.client = trellor.client
-  card.list_id = trellor.list(board_name,list_name).id
-  card.name = params['card_name']
-  card.save
+  if params['archive']
+    trellor.archive_card(board_name, list_name, params['card_name'])
+  else
+    trellor.create_card(board_name, list_name, params['card_name'], params['descript'])
+  end
 
   cards = trellor.list(board_name,list_name).cards.collect{ |c| c.name }
   cards.to_json
+  params.to_json
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trellor
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Brian Murphy-Dye