pb-cli 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8be764f8eb69bb8e9a2c17043a3243e23fd893a
-  data.tar.gz: 5839590a5423c6a7ca814873385ca13a37e1db3a
+  metadata.gz: fd953098ed7f1914d212fd03f90b2777466d53c1
+  data.tar.gz: 4c3732232b90d0cd7c5e0d3fcf676b91e35a4e78
 SHA512:
-  metadata.gz: e9d55e545367bea51a0a965765790a914854582b00bf972ae7d42115282c564a845c912e00bf2353497282c6de727811db7774bd4ed1b3ba00d7486872febdef
-  data.tar.gz: 3ea9a5542d44701fc3ae4f09d820bb510d6dbc0f4e33f3eec02a1487d40a33fd2b96aeb3ea98000dc9757f6fac34780eed5eb388202b9d4b06f906387f586a51
+  metadata.gz: 85aa6d0fc1cc40ea4d281246a5b4002a03cee5e2f5a25dc834dd2d03c4086a2dbd2d83d3d241edecb3396873240b3601eed93abcaefab01a7c4aad7da2ee8a0f
+  data.tar.gz: 7c044fb66bfb8d7668eb091a24c2e01dfe88b4956f624485ea2c8f9656180f07b07469e4ecc1207ec5da8a0ebf430af9cdfb87e8e8aeb6d349790a38b230e923

data/.travis.yml

@@ -1,4 +1,13 @@
 language: ruby
+
 rvm:
-  - 2.1.6
-before_install: gem install bundler -v 1.10.6
+  - 2.0.0
+  - 2.1.7
+  - 2.2.3
+
+before_install:
+  - gem install bundler
+  - bundle install --path vendor/bundle
+
+script:
+  - bundle exec rspec

data/Gemfile

@@ -5,5 +5,5 @@ gemspec
 
 gem "rspec"
 gem "thor"
-gem "json"
 gem "rest-client"
+gem "terminal-table"

data/Gemfile.lock

@@ -1,7 +1,10 @@
 PATH
   remote: .
   specs:
-    pb-cli (0.1.0)
+    pb-cli (0.2.1)
+      rest-client (~> 1.8)
+      terminal-table (~> 1.5)
+      thor (~> 0.19)
 
 GEM
   remote: https://rubygems.org/
@@ -11,7 +14,6 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
-    json (1.8.3)
     mime-types (2.6.2)
     netrc (0.10.3)
     rake (10.4.2)
@@ -32,6 +34,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
+    terminal-table (1.5.2)
     thor (0.19.1)
     unf (0.1.4)
       unf_ext
@@ -42,11 +45,11 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.10)
-  json
   pb-cli!
   rake (~> 10.0)
   rest-client
   rspec
+  terminal-table
   thor
 
 BUNDLED WITH

data/README.md

@@ -1,5 +1,7 @@
 # pb-cli
 
+[![Build Status](https://travis-ci.org/miya0001/pb-cli.svg?branch=master)](https://travis-ci.org/miya0001/pb-cli)
+
 A command line interface for Pushbullet.
 
 https://www.pushbullet.com/
@@ -28,6 +30,12 @@ Send notification.
 $ pb push <MESSAGE> [--title <TITLE>]
 ```
 
+Or send notification from STDIN.
+
+```
+$ ls -al | pb push
+```
+
 See also `pb help`.
 
 ## Development
@@ -38,7 +46,7 @@ $ cd pb-cli
 $ bundle install --path vendor/bundle
 ```
 
-### Running automated testing
+### Running automated tests
 
 ```
 $ bundle exec rspec

data/lib/pb/cli/device.rb

@@ -0,0 +1,25 @@
+# encoding: utf-8
+# vim: ft=ruby expandtab shiftwidth=2 tabstop=2
+
+require "thor"
+
+module Pushbullet_CLI
+  class Device < Thor
+    class_option :token, :desc => "Access token"
+
+    desc "list", "Get a list of devices belonging to the current user."
+    def list
+      url = "https://api.pushbullet.com/v2/devices?active=true"
+      token = Utils::get_token( options )
+
+      result = Utils::send( url, token, "get" )
+      row = result['devices'].map.with_index{ | device | [
+        device['iden'],
+        device['nickname'],
+        device['model'],
+      ] }
+
+      Utils:: print_table( [ "Iden", "Nickname", "Model" ], row )
+    end
+  end
+end

data/lib/pb/cli/util.rb

@@ -2,10 +2,12 @@
 # vim: ft=ruby expandtab shiftwidth=2 tabstop=2
 
 require "yaml"
+require "terminal-table"
 
 module Pushbullet_CLI
   class Utils
     class << self
+
       def get_config
         conf = {}
         if File.exists?( File.join( ENV["HOME"], '.pb-cli/config.yml' ) )
@@ -20,20 +22,53 @@ module Pushbullet_CLI
         return conf
       end
 
-      def send( url, access_token, args )
+      def get_token( options )
+        token = ""
+        unless options[:token].nil?
+          token = options[:token]
+        else
+          config = Utils::get_config
+          unless config["access_token"].nil?
+            token = config["access_token"]
+          end
+        end
+
+        unless token.empty?
+          return token
+        else
+          puts "Please initialize an Access Token with `pb init <ACCESS-TOKEN>`."
+          exit 1
+        end
+      end
+
+      def send( url, access_token, method = "post", args = {} )
         begin
-          RestClient.post(
-            url,
-            args.to_json,
-            :content_type => :json,
-            :accept => :json,
-            "Access-Token" => access_token
-          )
+          if "post" == method
+            return JSON.parse( RestClient.post(
+              url,
+              args.to_json,
+              :content_type => :json,
+              :accept => :json,
+              "Access-Token" => access_token
+            ) )
+          elsif "get" == method
+            return JSON.parse( RestClient.get(
+              url,
+              :content_type => :json,
+              :accept => :json,
+              "Access-Token" => access_token
+            ) )
+          end
         rescue => e
           $stderr.puts e.message
           exit 1
         end
       end
-    end
-  end
-end
+
+      def print_table( headers, rows )
+        puts Terminal::Table.new :headings => headers, :rows => rows
+      end
+
+    end # end self
+  end # end Utils
+end # end Pushbullet_CLI

data/lib/pb/cli/version.rb

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

data/lib/pb/cli.rb

@@ -3,38 +3,39 @@
 
 require "pb/cli/version"
 require "pb/cli/util"
+require "pb/cli/device"
 require "thor"
 require "rest-client"
 require "yaml"
 
 module Pushbullet_CLI
   class Command < Thor
-
-    def self.exit_on_failure?
-      true
-    end
+    class_option :token, :desc => "Access token"
 
     desc "push <MESSAGE>", "Send a push to devices or another persons."
-    method_option :title, :aliases => "-t", :desc => "Title of the notification."
-    # method_option :device, :aliases => "-d", :desc => "Target device to push."
+    method_option :title, :desc => "Title of the notification."
+    method_option :device, :desc => "Iden of the target device to push."
     # method_option :person, :aliases => "-p", :desc => "Delete the file after parsing it"
     def push( message = "" )
-      if File.pipe?(STDIN) || File.select([STDIN], [], [], 0) != nil then
+      if File.pipe?( STDIN ) || File.select( [STDIN], [], [], 0 ) != nil then
         message = STDIN.readlines().join( "" )
       end
 
       url = "https://api.pushbullet.com/v2/pushes"
+      token = Utils::get_token( options )
 
       if message
-        config = Utils::get_config
-
         args = {
           "type" => "note",
           "body" => message,
           "title" => ( options[:title] ? options[:title] : "" )
         }
 
-        Utils::send( url, config['access_token'], args )
+        if options[:device]
+          args['device_iden'] = options[:device]
+        end
+
+        Utils::send( url, token, "post", args )
       else
         puts "Nothing to do."
       end
@@ -51,5 +52,7 @@ module Pushbullet_CLI
       FileUtils.chmod( 0600, File.join( ENV["HOME"], '.pb-cli', 'config.yml' ) )
     end
 
+    desc "device <SUBCOMMAND>", "Manage devices."
+    subcommand "device", Device
   end # end class Command
 end # end module Pushbullet_CLi

data/pb-cli.gemspec

@@ -28,4 +28,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
+
+  spec.add_dependency 'thor', '~> 0.19'
+  spec.add_dependency 'rest-client', '~> 1.8'
+  spec.add_dependency 'terminal-table', '~> 1.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pb-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - miya0001
@@ -38,6 +38,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 description: Use Pushbullet from cli.
 email:
 - miya@wpist.me
@@ -57,6 +99,7 @@ files:
 - bin/setup
 - exe/pb
 - lib/pb/cli.rb
+- lib/pb/cli/device.rb
 - lib/pb/cli/util.rb
 - lib/pb/cli/version.rb
 - pb-cli.gemspec