winds-up-client 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c977484ed6f2ffb3fe271108f767cbdd0d8a63167f7f04b2fe70ba8db98e51e
-  data.tar.gz: f58fe88b996714cdbdd813f5f9e3f043373b32209f1f2ad8a50e1023096b3617
+  metadata.gz: 1c01dc1d45a5392f80552857adfb4f08ed4e814678005968cf74f3a7d995c9a2
+  data.tar.gz: 5f6897b47dc90b1c316c45cf954470d0e8a21ee69ad68cf253cb1a49279378d1
 SHA512:
-  metadata.gz: 4e6701714d7b10e93c0ef6448efdee550380817049a1de046575d9c9498b1954427e604579bf661f440f98a39c3f9eedeea7c8d50348ca2b3cd8c614e4a617a3
-  data.tar.gz: 9fbd86523722140574345da7ffdea4a4bb1258bcbdf79c4b08bee3d62ed16de3429bd4f4ca0af62f46658f1cc21306405170f84224b07ccc63af86c72e9a4097
+  metadata.gz: e99af979e3c415a7589bb31aa7bec8e71f0bf6d930fa5c0bed84529d6a39d627ff69caa68318ed6bc8e9e956b6b8582d2447e082fa4e3d30e93757e72adddf22
+  data.tar.gz: 9736db772e497a813793f156d7793ef1136e3c101bd49cb1665c4347b390b56a5145bfbd1aab77b9019bd52ac5e6524b53cf70b2dd990a7ac049f4112c4748da

data/bin/winds-up-client

@@ -2,8 +2,11 @@
 require 'winds-up-client'
 require 'trollop'
 WindsUpClient.new(Trollop::options do
-  opt :short
-  opt :lpass
-  opt :user, "user", :type => :string
-  opt :password, "password", :type => :string
+  opt :short, "short mode"
+  opt :lpass, "use lastpass-cli to retrieve credentials"
+  opt :user, "user", type: :string
+  opt :password, "password", type: :string
+  opt :sampling, "sampling factor for graphs", default: 2
+	opt :spot, "spot name", type: :string, default: nil
+  opt :nocolor, "no color"
 end).display_favorite_spots

data/lib/winds-up-client.rb

@@ -2,7 +2,22 @@
 require 'mechanize'
 require 'date'
 require 'json'
-require 'terminal-table'
+require 'paint'
+
+class TerminalTable 
+
+	def initialize attributes
+		@rows = attributes[:rows]
+	end
+
+	def to_s
+    return "" if @rows.size == 0
+    widths = @rows.reduce(@rows[0].size.times.to_a.map { 0 } ) { |memo, row| memo.each_with_index.map { |item, i| [row.size > i ? row[i].size : 0, item].max } }
+    @rows.map do |row|
+      row.each_with_index.map { |item, i| "#{item}#{" " * (widths[i] - item.size)}" }.join(" ")
+    end.join("\n")
+	end
+end
 
 class WindsUpClient
 
@@ -41,22 +56,41 @@ class WindsUpClient
     spots = page.search("div.mt3").reverse.map { |spot| parse_spot spot }
   end
 
+  def bar size, alternate, bg
+    if !@options[:nocolor]
+      Paint[(" " * size), nil, bg]
+    else
+      alternate * size
+    end
+  end
+
+  def low size
+    bar size, "=", :blue
+  end
+
+  def high size
+    bar size, "-", :green
+  end
+
+  def expected size
+    bar size, "*", :yellow
+  end
+
   def series_handlers
     {
-      actual: (-> (x) {"#{"=" * x["low"]}#{"-" * (x["high"] - x["low"])} #{(x["high"] + x["low"])/2}"}),
-      expected: (-> (x) {"#{ "*" * x["y"]} #{x["y"]} #{x["o"]}"})
+      actual: (-> (x) {"#{low(x["low"])}#{high(x["high"] - x["low"])} #{(x["high"] + x["low"])/2}"}),
+      expected: (-> (x) {"#{ expected(x["y"])} #{x["y"]} #{x["o"]}"})
     }
   end
 
   def spot_row spot
     title = [spot[:title], spot[:wind]]
     i = 0
-    sampling = 2
     rows = []
     rows << title
     series_handlers.each do |kind, handler|
       spot[:series][kind].each do |value|
-        rows << [Time.at(value["x"] / 1000).to_datetime.to_s.gsub(/\+.*/, ""), handler.call(value)] if i % sampling == 0
+        rows << [Time.at(value["x"] / 1000).to_datetime.to_s.gsub(/\+.*/, ""), handler.call(value)] if i % @options[:sampling] == 0
         i += 1
       end
     end
@@ -77,16 +111,18 @@ class WindsUpClient
     spots = favorites_spots
     previous_rows = []
     spots.each_with_index do |spot, i|
-      if @options[:short]
-        puts "#{spot[:title]}: #{spot[:wind]}"
-      else
-        rows = spot_row spot
-        if i % 2 == 1
-          puts Terminal::Table.new :rows => join_rows(previous_rows, rows)
-        end
-        previous_rows = rows
-      end
+			if @options[:spot].nil? or spot[:title].downcase.include?(@options[:spot])
+				if @options[:short]
+					puts "#{spot[:title]}: #{spot[:wind]}"
+				else
+					rows = spot_row spot
+					if i % 2 == 1
+						puts TerminalTable.new :rows => join_rows(previous_rows, rows)
+					end
+					previous_rows = rows
+				end
+			end
     end
-    puts Terminal::Table.new :rows => previous_rows if spots.size % 2 == 1 and !@options[:short]
+    puts TerminalTable.new :rows => previous_rows if spots.size % 2 == 1 and !@options[:short]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: winds-up-client
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Olivier Abdesselam
@@ -53,33 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: terminal-table
+  name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: paint
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.0'
 description: Allows to access winds-up.com on the CLI
 email: 
 executables: