clockker 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 577133b16adfca331464a0507a93165f8a512687
-  data.tar.gz: f79729e1efa08d8e3bdfbb90e9edc42323379131
+  metadata.gz: a5917fe8052498f65072fe075093b1af5d725ea0
+  data.tar.gz: 0c09c0cbb7b630660b8f0326ba799a5c08fea671
 SHA512:
-  metadata.gz: 2b3956f51e0a3b4660e0fb1068ee146dec57047e67f9a10673f7b3ae94cf10d6fdde9a69bdf5618aa86c8634a7aed2f374af53771cdc0766488c7af0063d54b1
-  data.tar.gz: 5aae16c9040e0455b3bd8738e7061e6f9be3d6f62a1b18c8603716b5af10a5cafd340d13c1b6f1faf5f290f1c72b09a7ca13c783b5350cb2f4264f5b18948411
+  metadata.gz: 4c674892ffb7178e58fa8430582014ae8d456e92dce3c303aa344f0e8c53cab6897298638b5b0c58a243beb6f4d8aa821ea0a58d639f3a22b9610d77d7574f2d
+  data.tar.gz: efe5566b8355c97fc08f2015047aae7450231c39b8001e8658c582488a587afe388bfe75bcc33171b4392dac4936f519be0492c950d97a3e12c36924eff155c4

data/README.md

@@ -30,6 +30,9 @@ Clockker takes several command-line options:
 `-s=x` / `--submit-frequency=x`
 : upload changed files list to Clockk server every <x> seconds. Default: 300 seconds.
 
+`-d` / `--development`
+: Development mode. In addition to submitting to the Clockk server, also submit the same artifacts to the server running at localhost:4000. Errors on the local server are logged and ignored.
+
 `-w=x y z` / `--whitelist=x y z`
 : Space-separated list of absolute paths to watch. Defaults to your home directory (~).
 

data/lib/clockker/cli.rb

@@ -16,6 +16,7 @@ module Clockker
     method_option :identifier, aliases: '-i', type: :string, desc: "The identifier for this computer.", default: identifier
     method_option :submit_frequency, aliases: '-s', default: 300, desc: "Submit changeset to Clockk server every N seconds", type: :numeric
     method_option :verbose, aliases: '-v', default: 'fatal', lazy_default: 'info', enum: %w{debug info warn error fatal}, desc: "Set verbosity (default: info)"
+    method_option :development, aliases: '-d', default: false, desc: "Submit to a development server at localhost:4000 as well as the production server"
     def watch
       logger = Logger.new(STDERR)
       case options[:verbose]
@@ -49,6 +50,7 @@ module Clockker
       clockker_config.region = options[:region] if options[:region]
       clockker_config.whitelist = options[:whitelist] if options[:whitelist]
       clockker_config.blacklist = options[:blacklist] if options[:blacklist]
+      clockker_config.development = options[:development] if options[:development]
 
       if options[:token].nil? && clockker_config.token.nil?
         puts "You must provide a value for the token, either as a parameter (--token=x) or in the ~/.clockker_config file."

data/lib/clockker/config.rb

@@ -2,7 +2,7 @@ require 'JSON'
 
 module Clockker
   class Config
-    attr_accessor :whitelist, :blacklist, :config_version, :token, :region, :identifier, :submit_frequency, :log_level
+    attr_accessor :whitelist, :blacklist, :config_version, :token, :region, :identifier, :submit_frequency, :log_level, :development
     def initialize(overrides = {})
       if File.exists?(File.join(Dir.home, '.clockker'))
         clockker_config = JSON.parse(File.read(File.join(Dir.home, '.clockker')))
@@ -18,6 +18,7 @@ module Clockker
       @region = clockker_config["region"]
       @submit_frequency = clockker_config["submit_frequency"]
       @log_level = clockker_config["log_level"]
+      @development = clockker_config["development"]
 
       # override values specified at the command line
       overrides.each do |key, value|

data/lib/clockker/version.rb

@@ -1,5 +1,5 @@
 module Clockker
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 
   def self.macos_version
     @mov ||= `sw_vers -productVersion`

data/lib/clockker/watcher.rb

@@ -17,7 +17,7 @@ module Clockker
 
       @queue = Queue.new
       @watcher = Thread.new { create_watcher('/', white_black_list, logger) }
-      @submitter = Thread.new { create_submitter(config.submit_frequency, config.region, config.token, config.identifier, logger) }
+      @submitter = Thread.new { create_submitter(config.submit_frequency, config.region, config.token, config.identifier, logger, config.development) }
       
       @watcher.join
       @submitter.join
@@ -42,10 +42,11 @@ module Clockker
       logger.info "#{Time.now} fswatcher done"
     end
 
-    def create_submitter(submit_frequency, region, token, identifier, logger)
-      logger.info "#{Time.now} submitting to clockk.com every #{submit_frequency} seconds with token #{token} from identifier #{identifier} with version #{Clockker.version}"
+    def create_submitter(submit_frequency, region, token, identifier, logger, development)
+      logger.info "#{Time.now} submitting to clockk.com #{"and localhost:4000 " if development}every #{submit_frequency} seconds with token #{token} from identifier #{identifier} with version #{Clockker.version}"
       t_start = Time.now
       clockk_agent_uri = URI("https://#{region}.clockk.io/api/v1/agent/artifacts")
+      clockk_local_uri = URI("http://localhost:4000/api/v1/agent/artifacts")
       @changeset = []
       loop do
         submit_now = false
@@ -84,6 +85,14 @@ module Clockker
               http.post(clockk_agent_uri.path, data, header)
             end
 
+            begin
+              Net::HTTP.start(clockk_local_uri.hostname, clockk_local_uri.port, use_ssl: clockk_local_uri.scheme == 'https') do |http|
+                http.post(clockk_local_uri.path, data, header)
+              end
+            rescue Exception => q
+              logger.info "#{Time.now} Failed to reach localhost:4000; ignoring"
+            end
+
             @changeset = []
           rescue Exception => e
             logger.info "#{Time.now} Reached exception #{e}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clockker
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Paul Doerwald
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-01 00:00:00.000000000 Z
+date: 2018-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-fsevent