trellor 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6ad82b34a2184354858178d296725d4ea60340b
-  data.tar.gz: 525f1c518828eb15e59b929b0c7f5c5ef969903e
+  metadata.gz: a9a7abd7667991d513c5a1fc0f24ec51e63b7b80
+  data.tar.gz: 6cb3116624da44f20ef787abe4415dab26062b76
 SHA512:
-  metadata.gz: 86aef3d5974ec8d1b93b366b012637d954570b509de2e3378b5ddd896e1d76caf51abc19e8a322e8584cd6f1265e588f01301e3eb8180caf07836099797bbcd8
-  data.tar.gz: 008fbf2dafe1ae825b9d11467370838c866a37800a5bfab7decd69896e0cdc5aa2f00643086c546e09ff0ea8a157db85461eaf5a72afe223a154d3021afb7471
+  metadata.gz: 4fdb1027f3444837db708e28358beae1d84971f43d598e66716b891a256b40119755d37f69aa353c83cf4c8422eda92bffd2db6434605619524f14857f80e978
+  data.tar.gz: db14810a4a883c0d799e6e538bf08249f7c7cee6549360bed4e29e97e399a1ec1a9ee5334f035e4a1f636b3f946154eee4a8f49fc91727cc59484b4271fe8c32

data/README.md

@@ -20,20 +20,29 @@ Three environment variables need to be set: TRELLOR_KEY, TRELLOR_TOKEN,
 
 ## Usage
 
+    $ trellor -h     # prints help
     $ trellor        # prints all board names
+    $ trellor        # caches all boards and lists to ~/.config/.trellor
+                     # toying with using this to speed access
+                     # however, the connection seems to be main slowdown
     $ trellor to     # prints all list names inside the first board with name
                      # beginning with 'to' (case insensitive)
-                     # for example, this will match 'ToDo'
-    $ trellor to.in  # prints all card names in the list named 'in*' in board
+                     # for example, this matches 'ToDo'
+    $ trellor to in  # prints all card names in the list named 'in*' in board
                      # named 'to*', e.g., matches 'ToDo.Inbox'
     # create a card:
-    $ trellor to.in 'this is a new card', 'this is an optional description.'
+    $ trellor to in 'this is a new card', 'this is an optional description.'
 
     Using aliases work well, for example:
-    $ alias inbox="trellor todo.inbox"
+    $ alias inbox="trellor todo inbox"
     $ inbox               # prints cards in todo.inbox
     $ inbox 'new card'    # creates a new card in todo.inbox
 
+Starting with version 2, a webapp is run in the background. Making the connection to
+Trello resulted in over half the time to run a command. The local webapp pays
+this cost only once.
+
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/cli.rb

@@ -9,6 +9,16 @@ module Trellor
         version "trellor #{VERSION}"
         opt :cache, 'Cache (or re-cache)', short: '-c'
         opt :verbose, 'Run verbosely', short: '-v'
+        opt :webapi, 'Run webapi', short: '-w'
+        opt :slowtrellor, 'Make own connection rather than using webapi', short: '-s'
+      end
+
+      if webapi?
+        puts 'webapi'
+        require_relative 'webapi'
+        run TrellorWebapi
+        puts 'done?'
+        sleep 10
       end
 
       if cache?
@@ -24,7 +34,16 @@ module Trellor
     def self.trellor
       unless @trellor
         verbose_log('creating Trellor instance')
-        @trellor = Trellor.new
+        @trellor = if @opts[:slowtrellor]
+          verbose_log('using local (slower) trellor')
+          Trellor.new
+        else
+          verbose_log('using webapi')
+          require_relative 'web_trellor'
+          web = WebTrellor.new
+          web.ensure_webapp_is_running
+          web
+        end
         @trellor.be_verbose = true if @opts[:verbose]
       end
       @trellor
@@ -69,18 +88,22 @@ module Trellor
       verbose_log "card_name", card_name
       if board_name.nil?
         puts "Boards:", '-'*50
-        trellor.boards.each{ |board| puts board.name }
+        trellor.board_names.each{ |name| puts name }
+        # trellor.boards.each{ |board| puts board.name }
       else
         if list_name.nil?
-          board = trellor.board(board_name)
-          puts "Board: #{board.name}", '-'*50
-          board.lists.each{ |list| puts list.name }
+          # 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: #{list.name}", '-'*50
-          list.cards.each{ |card| puts card.name }
+          # 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
-          trellor.create_card(board_name, list_name, card_name, descript)
+          card_names = trellor.create_card(board_name, list_name, card_name, descript)
+          card_names.each{ |name| puts name }
         end
       end
     end
@@ -89,6 +112,10 @@ module Trellor
       $stderr.puts("           ****** #{args.inspect}") if @opts[:verbose]
     end
 
+    def self.webapi?
+      @opts[:webapi]
+    end
+
     def self.cache?
       @opts[:cache]
     end

data/lib/trellor.rb

@@ -7,6 +7,14 @@ module Trellor
   class Trellor
     attr_accessor :be_verbose
 
+    def self.singleton
+      unless @singleton
+        puts 'getting singleton'
+        @singleton = self.new
+      end
+      @singleton
+    end
+
     def client(key=ENV['TRELLOR_KEY'], token=ENV['TRELLOR_TOKEN'])
       @client ||= connect(key, token)
     end
@@ -28,6 +36,29 @@ module Trellor
       @user ||= client.find(:members, ENV['TRELLOR_USERNAME'])
     end
 
+    def board_names
+      boards.collect{ |board| board.name }.sort_by{|name| name.downcase}
+    end
+    def list_names(board_name)
+      board(board_name).lists.collect{ |list| list.name }.sort_by{|name| name.downcase}
+    end
+    def card_names(board_name, list_name)
+      list(board_name, list_name).cards.collect{ |card| card.name }
+    end
+    def create_card(board_name, list_name, name, descript=nil)
+      card = Trello::Card.new
+      card.client = client
+      card.list_id = list(board_name, list_name).id
+      card.name = name
+      card.desc = descript if descript
+      card.save
+      card_names(board_name, list_name)
+    end
+
+
+
+
+
     def boards
       verbose_log('getting boards') unless @boards
       @boards ||= user.boards.select{ |b| !b.closed? }
@@ -62,15 +93,6 @@ module Trellor
         card.name==card_name
       end
     end
-
-    def create_card(board_name, list_name, name, descript=nil)
-      card = Trello::Card.new
-      card.client = client
-      card.list_id = list(board_name, list_name).id
-      card.name = name
-      card.desc = descript if descript
-      card.save
-    end
   end
 end
 

data/lib/trellor/version.rb

@@ -1,3 +1,3 @@
 module Trellor
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end

data/lib/web_trellor.rb

@@ -0,0 +1,134 @@
+# TODO: show card descriptions
+
+require 'trello'
+require 'net/http'
+require_relative "trellor/version"
+
+module Trellor
+  class WebTrellor
+    attr_accessor :be_verbose
+
+    def ensure_webapp_is_running
+      fail unless VERSION == get_version
+    rescue
+      puts "The background webapp wasn't running. Will run it now."
+      cmd = "ruby lib/webapi.rb &> /dev/null"
+      job1 = fork do
+        exec cmd
+      end
+      Process.detach(job1)
+      sleep 0.5
+    end
+
+    def get_version
+      response = get_http('/version')
+      response.body
+    end
+
+    def get_http(url, timeout=nil)
+      uri = URI("#{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)
+    rescue Exception => e
+      $stderr.puts "ERROR in get_http(#{url})"
+      raise e
+    end
+
+    def default_open_timeout
+      60
+    end
+
+    def post_http(url, data, timeout=nil)
+      uri = URI("#{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::Post.new(uri.request_uri)
+      # request.basic_auth 'trellor', password if password
+
+      request.set_form_data data
+      http.request(request)
+    rescue Exception => e
+      $stderr.puts "ERROR in post_http(#{url})"
+      raise e
+    end
+
+    def default_open_timeout
+      @default_open_timeout ||= (ENV['TRELLOR_OPEN_TIMEOUT'] || 1).to_i
+    end
+
+    def default_read_timeout
+      @default_read_timeout = (ENV['TRELLOR_READ_TIMEOUT'] || 30).to_i
+    end
+
+    def site
+      "http://localhost:#{port}"
+    end
+    def port
+      4567
+    end
+
+    def verbose_log(*args)
+      $stderr.puts("           ****** #{args.inspect}") if be_verbose
+    end
+
+    def user()
+      verbose_log('username', ENV['TRELLOR_USERNAME'])
+      @user ||= client.find(:members, ENV['TRELLOR_USERNAME'])
+    end
+
+    def board_names
+      verbose_log('getting boards') unless @boards
+      @boards = JSON.parse(get_http('/boards').body)
+      #@boards ||= user.boards.select{ |b| !b.closed? }
+    end
+
+    def list_names(board_name)
+      JSON.parse(get_http("/boards/#{board_name}/lists").body)
+    end
+
+    def card_names(board_name, list_name)
+      JSON.parse(get_http("/boards/#{board_name}/lists/#{list_name}/cards").body)
+    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)
+    end
+
+
+
+
+
+    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) }
+    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
+    end
+
+    def cards(board_name, list_name)
+      verbose_log('       getting cards for', board_name, list_name)
+      list(board_name, list_name).cards
+    end
+
+    def card(board_name, list_name, card_name)
+      list(board_name, list_name).cards.detect do |card|
+        card.name==card_name
+      end
+    end
+  end
+end
+

data/lib/webapi.rb

@@ -0,0 +1,52 @@
+require 'sinatra'
+require 'json'
+require_relative 'trellor/version'
+require_relative 'trellor'
+
+module Trellor
+  class TrellorWebapi < Sinatra::Base
+    get '/' do
+      "Hello, world!"
+    end
+  end
+end
+
+def trellor
+  Trellor::Trellor.singleton
+end
+
+get '/version' do
+  Trellor::VERSION
+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
+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
+
+  cards = trellor.list(board_name,list_name).cards.collect{ |c| c.name }
+  cards.to_json
+end
+

data/trellor.gemspec

@@ -21,6 +21,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'ruby-trello'
   spec.add_dependency 'trollop'
+  # for webapi.rb only. Wonder if there is a way to make it a dependency only
+  # when it is used?
+  spec.add_dependency 'sinatra'
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trellor
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Brian Murphy-Dye
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-trello
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +114,8 @@ files:
 - lib/cli.rb
 - lib/trellor.rb
 - lib/trellor/version.rb
+- lib/web_trellor.rb
+- lib/webapi.rb
 - trellor.gemspec
 homepage: ''
 licenses: