gcp_directory 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4f187d03c42f511e3f0bb076dab0468ea38b4a1
-  data.tar.gz: dee1130a879c71ae58e9b627fe1dd989cc1978a6
+  metadata.gz: 2ce54e300dfbdb346b011998f657976c127ef3be
+  data.tar.gz: e4ee507ea20d1428a1f482dbf7aa76d6ba5fb3ad
 SHA512:
-  metadata.gz: f56487af955d5b25492ec2a5371bfa4bb37fa14b32b852f32ef66d560eb3e22e89198f9552df301041c24a865325ea735c29e705b85334d670ae2b25bfab7c73
-  data.tar.gz: dd83bb1cc382b0a061478cac485213dff488ec591e487239a8b242ba9ce1eeafec1804bb1b3bf61eff8038a39ed08a55bdd4f15e787cf68e08f01520abb1b8aa
+  metadata.gz: 4e23183f2ab7a6f6ceed5177988ea6d86e402f942fd83125ccaf23d989dd6cdc2daed31fd18bd060f435f7c8ab650bd8510a56e4230c37285373e432d2e12a1f
+  data.tar.gz: 2d1f8f1f66429dac5796043d2fb04e3b38c5186ccee4ab61e06b1f1581181635b3a99627aaefc6d6d3bd85f9391329272a09247095a45abc7ee5498e0902a749

data/README.md

@@ -11,15 +11,20 @@ Listen to a directory for new files and send files to Google Cloud Print.
 ### Setup OAUTH
 
 1. Get secrets from from Google API Console website: https://console.developers.google.com
-2. <img src='google_api_console.png' />
-3. Copy client secrets file to `.secrets.json` in listening directory.
-4. run `gcp_fetch_token PATH_TO_DIRECTORY`
+2. Copy client secrets file to `.secrets.json` in listening directory. <img src='google_api_console.png' />
+3. run `gcp_fetch_token PATH_TO_DIRECTORY`
 
 If you need to listen to multiple directories startup more than one program.
 
-### config.yml
-```yaml
-
+### config.json
+```json
+{
+  "printerid": "some_printer_id",
+  "ticket": {
+    "version": "1.0",
+    "print": {}
+  }
+}
 ```
 
 ## Installation

data/exe/gcp_listen

@@ -5,8 +5,5 @@ require 'gcp_directory'
 
 GcpDirectory.directory = ARGV[0] || raise('first argument must by listening directory')
 
-# always update token
-GcpDirectory.refresh_token
-
 # list for files
 GcpDirectory::Listener.listen

data/lib/gcp_directory.rb

@@ -28,7 +28,7 @@ module GcpDirectory
   end
 
   def self.config
-    JSON.parse(File.read(File.join(directory, 'printer.json'))).symbolize_keys
+    JSON.parse(File.read(File.join(directory, 'config.json'))).symbolize_keys
   end
 
   def self.secrets_path
@@ -61,6 +61,7 @@ module GcpDirectory
   end
 
   def self.refresh_token
+    logger.info('Refreshing auth token')
     auth = auth_client(token_path)
     auth.refresh!
     write_token(auth)

data/lib/gcp_directory/listener.rb

@@ -4,20 +4,30 @@ module GcpDirectory
   # Watch for changes and send to API
   class Listener
 
-    def initialize(auth=GcpDirectory.token_client)
-      @api = Printer.new(auth)
-
+    def initialize
+      @api = Printer.new
     end
 
     def logger
       GcpDirectory.logger
     end
+
     def self.logger
       GcpDirectory.logger
     end
 
+    def refresh_token_if_needed
+      if @last_refresh.nil? or @last_refresh < 59.minutes.ago
+        GcpDirectory.refresh_token
+        @last_refresh = Time.now
+        @api = Printer.new
+      end
+    end
+
     def print(added)
-      return if added =~ /\.(done|error)$/
+      return if added =~ /\.(done|error|json)$/
+      refresh_token_if_needed
+
       GcpDirectory.config[:printerid] || raise(ArgumentError, '`printerid` not defined in config!')
       options = GcpDirectory.config.merge(
         title: added,
@@ -33,11 +43,7 @@ module GcpDirectory
 
     def self.listen
       instance = GcpDirectory::Listener.new
-
       listener = Listen.to(GcpDirectory.directory) do |modified, added, removed|
-        logger.debug "modified absolute path: #{modified}"
-        logger.debug "added absolute path: #{added}"
-        logger.debug "removed absolute path: #{removed}"
         added.each { |file| instance.print(file) } if added
       end
       listener.start # not blocking

data/lib/gcp_directory/printer.rb

@@ -6,7 +6,7 @@ module GcpDirectory
 
     debug_output(GcpDirectory.logger)
 
-    def initialize(auth = GcpDirectory.auth_client(GcpDirectory.token_path))
+    def initialize(auth = GcpDirectory.token_client)
       auth.access_token || raise(ArgumentError, "`access_token` not set in #{auth}")
       @auth = auth
     end
@@ -15,21 +15,15 @@ module GcpDirectory
       self.class.post('/jobs', with_default_options(options))
     end
 
-    def submit(printerid:, title:, content:, ticket: default_ticket)
+    def submit(printerid:, title:, content:, ticket:)
       self.class.post('/submit', with_default_options(body: {
         printerid: printerid,
         title: title,
-        ticket: ticket.to_json
+        ticket: ticket.to_json,
+        content: content
       }))
     end
 
-    def default_ticket
-      {
-        version: '1.0',
-        print: {}
-      }
-    end
-
     def with_default_options(**options)
       {
         headers: {

data/lib/gcp_directory/version.rb

@@ -1,3 +1,3 @@
 module GcpDirectory
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gcp_directory
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Scott Pierce