pb-cli 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cf14545e96206baca46c7f609151005d0a363f4
-  data.tar.gz: 4527730687bac7a82ef6f916240ed1f5ec1378ce
+  metadata.gz: d4ab9448679cc2513803963262826eb4f89b21cd
+  data.tar.gz: 4ff7a84e6f415bb073d249463bb6d0ab9572bc15
 SHA512:
-  metadata.gz: 14cf88750591bd8c6ae8fe1d223d134f0a6778eaad5db462b94d93e17ed18b3ca506b547e1bad0b348eda293ce039ddbd578901efb4c64c00c958b6d76558251
-  data.tar.gz: 5e9e59dba592122513cfd88c515ef680b6653f94611b69e96d27ac2ef22c2f758c4997c4a233b54d760ad75a8a7638175e4867e7feefc645ae2cbaae7b0839e7
+  metadata.gz: eeac3fca3367df6a7914c015ef016d22b66e227c1c71d3193877035936b118ab3032e9e2dea36191051aded66d25e5d13e2548bd4d81410089fd103b5a8bfdb2
+  data.tar.gz: 36a53918acfc698eaf4f4ad2cc9f015a22a111020851b52227ee23a68ddafcb8fba3fe10fd71d03e45fcd0d2801c460862deabea1a5ea380ec47d5a500d10f29

data/Gemfile

@@ -3,6 +3,8 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in pb-cli.gemspec
 gemspec
 
+gem "bundler"
+gem "rake"
 gem "rspec"
 gem "thor"
 gem "rest-client"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pb-cli (0.3.0)
+    pb-cli (0.3.1)
       rest-client (~> 1.8)
       terminal-table (~> 1.5)
       thor (~> 0.19)
@@ -44,9 +44,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.10)
+  bundler
   pb-cli!
-  rake (~> 10.0)
+  rake
   rest-client
   rspec
   terminal-table

data/lib/pb/cli/device.rb

@@ -8,18 +8,26 @@ module Pushbullet_CLI
     class_option :token, :desc => "Access token"
 
     desc "list", "Get a list of devices belonging to the current user."
+    method_option :format, :desc => "Accepted values: table, json. Default: table"
+    method_option :fields, :desc => "Limit the output to specific object fields."
     def list
       url = "https://api.pushbullet.com/v2/devices?active=true"
       token = Utils::get_token( options )
+      cols = [ 'iden', 'nickname', 'created' ]
+
+      unless options[:fields].nil?
+        unless options[:fields].empty?
+          cols = options[:fields].split( /\s*,\s*/ )
+        end
+      end
 
       result = Utils::send( url, token, "get" )
-      row = result['devices'].map.with_index{ | device | [
-        device['iden'],
-        device['nickname'],
-        device['model'],
-      ] }
+      Utils::print( {
+        :format => options[:format],
+        :cols => cols,
+        :rows => result['devices'],
+      } )
+    end # end list
 
-      Utils:: print_table( [ "Iden", "Nickname", "Model" ], row )
-    end
   end
 end

data/lib/pb/cli/push.rb

@@ -10,6 +10,7 @@ module Pushbullet_CLI
     desc "create <MESSAGE>", "Send a push to devices or another persons."
     method_option :title, :desc => "Title of the notification."
     method_option :device, :desc => "Iden of the target device to push."
+    method_option :url, :desc => "The url to open."
     # method_option :person, :aliases => "-p", :desc => "Delete the file after parsing it"
     def create( message = "" )
       if File.pipe?( STDIN ) || File.select( [STDIN], [], [], 0 ) != nil then
@@ -20,23 +21,40 @@ module Pushbullet_CLI
       token = Utils::get_token( options )
 
       unless message.empty?
-        args = {
-          "type" => "note",
-          "body" => message,
-          "title" => ( options[:title] ? options[:title] : "" )
-        }
-
-        unless options[:device].nil?
-          unless options[:device].empty?
-            args['device_iden'] = options[:device]
-          end
-        end
-
+        args = Utils::get_push_args( options )
+        args['body'] = message
         Utils::send( url, token, "post", args )
       else
         puts "Nothing to do."
       end
-    end
+    end # end create
+
+    desc "list", "Request push history."
+    method_option :format, :desc => "Accepted values: table, json. Default: table"
+    method_option :fields, :desc => "Limit the output to specific object fields."
+    def list
+      url = "https://api.pushbullet.com/v2/pushes?active=true"
+      token = Utils::get_token( options )
+      cols = [ 'iden', 'type', 'title', 'created' ]
+
+      unless options[:fields].nil?
+        unless options[:fields].empty?
+          cols = options[:fields].split( /\s*,\s*/ )
+        end
+      end
+
+      result = Utils::send( url, token, "get" )
+      Utils::print( {
+        :format => options[:format],
+        :cols => cols,
+        :rows => result['pushes'],
+      } )
+    end # end list
 
   end
 end
+
+# curl --header 'Access-Token: VeoW8P4oMACU46KXMYAA4f1ahIpRvB4E' \
+# --data active=true \
+# --get \
+# https://api.pushbullet.com/v2/pushes

data/lib/pb/cli/utils.rb

@@ -3,24 +3,76 @@
 
 require "yaml"
 require "terminal-table"
+require "date"
 
 module Pushbullet_CLI
   class Utils
     class << self
 
+      def parse_row( cols, row )
+        table = []
+        cols.each{ |col|
+          if "created" == col || "modified" == col
+            val = Time.at( row[col] )
+          else
+            val = row[col]
+          end
+          table.push( val )
+        }
+        return table
+      end
+
+      def print( args )
+        if "json" == args[:format]
+          puts JSON.generate( args[:rows] )
+        else
+          table = args[:rows].map.with_index{ | row | parse_row( args[:cols], row ) }
+          Utils:: print_table( args[:cols], table )
+        end
+      end # end print
+
+      def get_push_args( options )
+        args = {}
+
+        unless options[:title].nil?
+          unless options[:title].empty?
+            args["title"] = options[:title]
+          end
+        end
+
+        unless options[:device].nil?
+          unless options[:device].empty?
+            args["device_iden"] = options[:device]
+          end
+        end
+
+        unless options[:url].nil?
+          unless options[:url].empty?
+            args["url"] = options[:url]
+            args["type"] = "link"
+          end
+        end
+
+        if args["type"].nil?
+          args["type"] = "note"
+        end
+
+        return args
+      end # end get_push_args
+
       def get_config
         conf = {}
         if File.exists?( File.join( ENV["HOME"], '.pb-cli/config.yml' ) )
-          _custom = YAML.load(
+          config = YAML.load(
             File.open(
               File.join( ENV["HOME"], '.pb-cli/config.yml' ),
               File::RDONLY
             ).read
           )
-          conf.merge!(_custom) if _custom.is_a?(Hash)
+          conf.merge!( config ) if config.is_a?(Hash)
         end
         return conf
-      end
+      end # end get_config
 
       def get_token( options )
         token = ""
@@ -39,7 +91,7 @@ module Pushbullet_CLI
           $stderr.puts "Please initialize an Access Token with `pb init <ACCESS-TOKEN>` or run command with `--token=<ACCESS-TOKEN>`."
           exit 1
         end
-      end
+      end # end get_token
 
       def send( url, access_token, method = "post", args = {} )
         begin
@@ -63,11 +115,11 @@ module Pushbullet_CLI
           $stderr.puts e.message
           exit 1
         end
-      end
+      end # end send
 
       def print_table( headers, rows )
         puts Terminal::Table.new :headings => headers, :rows => rows
-      end
+      end # end print_table
 
     end # end self
   end # end Utils

data/lib/pb/cli/version.rb

@@ -2,5 +2,5 @@
 # vim: ft=ruby expandtab shiftwidth=2 tabstop=2
 
 module Pushbullet_CLI
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/pb-cli.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.3"
 
   spec.add_dependency 'thor', '~> 0.19'
   spec.add_dependency 'rest-client', '~> 1.8'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pb-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - miya0001
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-03 00:00:00.000000000 Z
+date: 2015-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement