apocalypse-client 0.0.3 → 0.0.4

data/lib/apocalypse-client.rb

@@ -18,10 +18,11 @@ end
 
 module Apocalypse
   class Client
-    def self.host_file;     "#{File.dirname(__FILE__)}/../host.yml"; end
-    def self.cron_job_file; "/etc/cron.d/apocalyse"; end    
-    def self.rvm?;          !`which rvm`.chomp.empty? end        
-    
+    # Was "#{File.dirname(__FILE__)}/../host.yml"
+    def self.host_file;     "/etc/apocalypse.yml"; end
+    def self.cron_job_file; "/etc/cron.d/apocalypse"; end
+    def self.rvm?;          !`which rvm`.chomp.empty? end
+
     def self.cron_job_command
       return rvm? \
         ? " * * * * * root PATH=$PATH:/sbin:/usr/sbin rvm use $RUBY_VERSION ; /usr/local/bin/rvm exec apocalypse-client report > /dev/null" \
@@ -35,7 +36,7 @@ module Apocalypse
       Net::HTTP.start(properties[:server_address], properties[:port]) do |http|
         request.basic_auth(properties[:username], properties[:password])
         response              = http.request(request)
-        
+
         Apocalyse::Client::Response.parse!(response)
       end
     end
@@ -53,6 +54,7 @@ module Apocalypse
         puts "Everything seems to be in place. You're good to go."
       else
         errors.each { |error| puts errors }
+        exit(1)
       end
     end
 
@@ -66,6 +68,7 @@ module Apocalypse
     end
 
     def install(options)
+      check(options)
       installation = Apocalyse::Client::Install.new
       installation.install!
     end
@@ -143,18 +146,18 @@ module Apocalypse
           'rxbytes' => `/usr/bin/env ifconfig #{device_name} | grep bytes | awk '/RX/ {print $2}' | tr -s ':' ' ' | awk '{print $2}'`.strip,
           'txbytes' => `/usr/bin/env ifconfig #{device_name} | grep bytes | awk '/TX/ {print $6}' | tr -s ':' ' ' | awk '{print $2}'`.strip,
           'ipv4address' => `/usr/bin/env ifconfig #{device_name} | egrep -o 'inet addr\:[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' | tr -s ':' ' ' | awk '{print $3}'`.strip,
-          'broadcast' => `/usr/bin/env ifconfig #{device_name} | egrep -o Bcast\:[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\} | tr -s ':' ' ' | awk '{print $2}'`.strip,
-          'netmask' => `/usr/bin/env ifconfig #{device_name} | egrep -o Mask\:[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\} | tr -s ':' ' ' | awk '{print $2}'`.strip,
+          'broadcast' => `/usr/bin/env ifconfig #{device_name} | egrep -o 'Bcast\:[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' | tr -s ':' ' ' | awk '{print $2}'`.strip,
+          'netmask' => `/usr/bin/env ifconfig #{device_name} | egrep -o 'Mask\:[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' | tr -s ':' ' ' | awk '{print $2}'`.strip,
           'gateway' => `netstat -rn | grep ^0.0.0.0 | grep UG | grep #{device_name} | awk '{print $2}' | head -n1`.strip,
           'ipv6addr' => `/usr/bin/env ifconfig #{device_name} | egrep -o 'inet6 addr\:\ \([a-fA-F0-9]\{1,4}\:\{1,2\}[a-fA-F0-9]\{1,4}\:\{1,2\}\)+[A-Fa-f0-9\/^\ ]+' | awk '{print $3}'`.strip,
-          'ipv6scope' => `/usr/bin/env ifconfig #{device_name} | egrep -o Scope\:[a-zA-Z]+ | cut -d":" -f2`.strip
+          'ipv6scope' => `/usr/bin/env ifconfig #{device_name} | egrep -o 'Scope\:[a-zA-Z]+' | cut -d":" -f2`.strip
         }}
       end
     end
-    
+
     private
       def properties
-        throw Exception.new("Host file not found. Please run `apocalyse-client now`") unless File.exists?(self.class.host_file)
+        throw Exception.new("Host file not found. Please run `apocalypse-client now`") unless File.exists?(self.class.host_file)
         @properties ||= ::YAML.load(File.open(self.class.host_file))
       end
   end

data/lib/apocalypse-client/version.rb

@@ -1,5 +1,5 @@
 module Apocalypse
   class Client
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/spec/client_spec.rb

@@ -53,11 +53,11 @@ describe Apocalypse::Client do
         "/usr/bin/env ifconfig eth0 | grep bytes | awk '/RX/ {print $2}' | tr -s ':' ' ' | awk '{print $2}'" => "384735745",
         "/usr/bin/env ifconfig eth0 | grep bytes | awk '/TX/ {print $6}' | tr -s ':' ' ' | awk '{print $2}'" => "3575372573",
         "/usr/bin/env ifconfig eth0 | egrep -o 'inet addr\:[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' | tr -s ':' ' ' | awk '{print $3}'" => "10.187.234.18",
-        "/usr/bin/env ifconfig eth0 | egrep -o Bcast\:[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\} | tr -s ':' ' ' | awk '{print $2}'" => "10.187.234.254",
-        "/usr/bin/env ifconfig eth0 | egrep -o Mask\:[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\} | tr -s ':' ' ' | awk '{print $2}'" => "255.0.0.0",
+        "/usr/bin/env ifconfig eth0 | egrep -o 'Bcast\:[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' | tr -s ':' ' ' | awk '{print $2}'" => "10.187.234.254",
+        "/usr/bin/env ifconfig eth0 | egrep -o 'Mask\:[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' | tr -s ':' ' ' | awk '{print $2}'" => "255.0.0.0",
         "netstat -rn | grep ^0.0.0.0 | grep UG | grep eth0 | awk '{print $2}' | head -n1" => "10.187.234.1",
         "/usr/bin/env ifconfig eth0 | egrep -o 'inet6 addr\:\ \([a-fA-F0-9]\{1,4}\:\{1,2\}[a-fA-F0-9]\{1,4}\:\{1,2\}\)+[A-Fa-f0-9\/^\ ]+' | awk '{print $3}'" => "fe80::1031:3cff:fe00:bde1/64",
-        "/usr/bin/env ifconfig eth0 | egrep -o Scope\:[a-zA-Z]+ | cut -d\":\" -f2" => "Link"
+        "/usr/bin/env ifconfig eth0 | egrep -o 'Scope\:[a-zA-Z]+' | cut -d\":\" -f2" => "Link"
       }.each do |command, result|
         @reporter.should_receive(:`).with(command).and_return(result)
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: apocalypse-client
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Ariejan de Vroom