snapme 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abdae2cc364480149efdfdc721b199aa8678a01c
-  data.tar.gz: 4683b97c1f6429fdb24026d7527247e609238dce
+  metadata.gz: 39df5e7ca815a170dc0f4ae3e046e6468681408f
+  data.tar.gz: 880c624fb0565383d968b07e34086fdefce4e62c
 SHA512:
-  metadata.gz: 6b29d82a52e106bbeaaab70c60be2b20b6244a5bce533f68add7e409db4b3331b5e735b1f8c484487d805191657d5976ee00521dbd39ee0af8b125bc4dafa354
-  data.tar.gz: 95b86e4d1131b28d5e35566393159a8aa882c15299916bf07d66ae9e07ede085b57b96be84cd3dfd6edc762ef37f60000359e3883bd19b3cc5d33bcb0b4f7238
+  metadata.gz: 739dd668b8d1b6fb7ae25a945678b1cba057a6d41f72775eb05325a08b89c7e970c613d169bfe3ab5621a46a454f19aa1f5cdd4364ce042e47cdfebea31f9146
+  data.tar.gz: ba5d42afa1ff400bc3c8a9f774fdf2635785a1426f61872b7ec4c0d8e117d2e3d387102526a085deb35f97d9544d46b97a729f9180267b0113aaa478c16d676f

data/bin/snapme

@@ -1,4 +1,10 @@
 #!/usr/bin/env ruby
 
-require 'snapme'
+begin
+  require 'snapme'
+rescue LoadError
+  $:.unshift('./lib')
+  require 'snapme'
+end
+
 Snapme::CLI::Command.start(ARGV.dup)

data/lib/snapme/cli/command.rb

@@ -2,9 +2,28 @@ module Snapme
   module CLI
     class Command
       def self.start(args)
-        options = Options.parse(args)
-        Process.daemon(true) if options.daemon
-        Snapper.new(options.host, options.interval).run
+        options    = Options.parse(args)
+        auth_token = ENV['SNAPME_AUTH_TOKEN']
+
+        if options.kill
+          `killall snapme`
+          return
+        end
+
+        if options.show_version
+          puts Snapme::Version
+          return
+        end
+
+        if auth_token
+          Process.daemon(true) if options.daemon
+          Snapper.new(options.host, options.interval, auth_token).run
+        else
+          puts <<-MSG
+  Please set SNAPME_AUTH_TOKEN in your environment. You can get your
+  auth token from http://snapme.herokuapp.com
+          MSG
+        end
       end
     end
   end

data/lib/snapme/cli/options.rb

@@ -6,12 +6,14 @@ module Snapme
       DEFAULT_HOST     = 'http://snapme.herokuapp.com'
       DEFAULT_INTERVAL = 30 #seconds
 
-      attr_reader :daemon, :host, :interval
+      attr_reader :daemon, :host, :interval, :kill, :show_version
 
-      def initialize(daemon: true, host: DEFAULT_HOST, interval: DEFAULT_INTERVAL)
+      def initialize(daemon: true, host: DEFAULT_HOST, interval: DEFAULT_INTERVAL, kill: false, show_version: false)
         @daemon   = !!(daemon)
         @host     = host
         @interval = interval.to_i
+        @kill     = kill
+        @show_version = show_version
       end
 
       def self.parse(args)
@@ -36,6 +38,14 @@ module Snapme
           opts.on('-i', '--interval [SECONDS]', 'Snapshot interval') do |seconds|
             options[:interval] = seconds
           end
+
+          opts.on('-k', '--kill', 'Kill any snapme processes') do
+            options[:kill] = true
+          end
+
+          opts.on('-v', '--version', 'Print snapme version') do
+            options[:show_version] = true
+          end
         end.parse!(args)
 
         new(options)

data/lib/snapme/snapper.rb

@@ -4,7 +4,7 @@ module Snapme
   class Snapper
     attr_reader :auth_token, :command, :host, :interval
 
-    def initialize(host, interval, auth_token = ENV['SNAPME_AUTH_TOKEN'], command = ImagesnapCommand.new)
+    def initialize(host, interval, auth_token, command = ImagesnapCommand.new)
       @auth_token = auth_token
       @command    = command
       @host       = host

data/lib/snapme/version.rb

@@ -2,7 +2,7 @@ module Snapme
   module Version
     MAJOR = 0
     MINOR = 2
-    PATCH = 1
+    PATCH = 2
     PRE   = nil
 
     def self.to_s

data/spec/lib/snapme/cli/command_spec.rb

@@ -6,8 +6,10 @@ describe Snapme::CLI::Command do
     let(:args)   { double :args                             }
     let(:options){ OpenStruct.new                           }
     let(:snapper){ double('Snapme::Snapper').as_null_object }
+    let(:token)  { 'abc123'                                 }
 
     before do
+      ENV['SNAPME_AUTH_TOKEN'] = token
       allow(Snapme::CLI::Options).to receive(:parse).and_return(options)
       allow(Snapme::Snapper).to      receive(:new).and_return(snapper)
     end
@@ -35,7 +37,7 @@ describe Snapme::CLI::Command do
       options.interval = interval
       snapper = double 'Snapme::Snapper'
 
-      expect(Snapme::Snapper).to receive(:new).with(host, interval).and_return(snapper)
+      expect(Snapme::Snapper).to receive(:new).with(host, interval, token).and_return(snapper)
       expect(snapper).to receive(:run)
 
       described_class.start(args)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snapme
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jay Hayes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb