headsail 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1310095ac778210b66e678fcccc0cdce94f0d1a
-  data.tar.gz: e34ef77b69313be48a40d1829d579aee9243b27e
+  metadata.gz: 7cff3d768d1f66dfcc566bcffba3b57079a4c939
+  data.tar.gz: 769397d2aaccfc574b68a1082265c0fd559b681b
 SHA512:
-  metadata.gz: c0dd492c2bd2090320e5d8f8dc8db5d4fc654fa4ebfdf5dba86de1301f7f2fd876025972347f02f181961111b681d1682f4179b08c9598c96c62c4027b9c966e
-  data.tar.gz: 690a4c8fafac1f05f63d99d4b483aa2e4dde8992d10327b5a7795b4d41c07b20e40b4b8cfc9ddb8b21a8ef03112d4aa14547fc1f7435cb51a963f576bf49c568
+  metadata.gz: c8808ff0aea3de8e240496e803d9d34010b7dbbcf4ad2b8d0a2fe70318dcb26044d57ef0a84ec5768e14a79b7b6596e064e94182433388cea90feb50a2251f04
+  data.tar.gz: a95313f9cf3b212b58b40e4bb79af86886a89cfe1457f2d450a8c9986127be0e844b3806b520437438dac71a1939fff72046ded03138a100036e2ec9aac33e16

data/bin/headsail

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'headsail'
-require 'headsail/cli'
 
 cli = Headsail::CLI.new(ARGV)
 cli.run

data/headsail.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "byebug", "~> 5.0"
 end

data/lib/headsail/api.rb

@@ -4,10 +4,13 @@ module Headsail
 
     def initialize(config)
       @name = config['name']
-      @timer = config['timer']
+      @timer = config['timer'].to_i
       @oauth = config['oauth']
       @method = config['request']['method']
       @uri = build_uri(config['request'])
+    rescue
+      Headsail.err('Improper API YAML format.')
+      exit 1
     end
 
     private

data/lib/headsail/cli.rb

@@ -11,7 +11,6 @@ module Headsail
     # Creates a new CLI object, parsing the arguments that are passed to it,
     # and readying a Launcher to be run
     #
-    # @param argv [Array] an array of command-line arguments
     def initialize(argv)
       @argv = argv
       @configure = nil
@@ -57,7 +56,7 @@ module Headsail
     def parse_options
       @parser.parse!(@argv)
     rescue
-      print 'Unsupported Options'
+      Headsail.err('Unsupported options entered in CLI.')
       exit 1
     end
   end

data/lib/headsail/client.rb

@@ -14,6 +14,7 @@ module Headsail
     def run
       @tasks.each { |task| @threads << task.run }
       @threads.map(&:execute)
+      Headsail.info('Started up the Headsail Client.')
       loop { sleep 300 }
     end
 

data/lib/headsail/configure.rb

@@ -7,6 +7,9 @@ module Headsail
 
     def load_apis(path)
       @apis = YAML.load_file(path)
+      Headsail.info('Loaded API YAML file.')
+    rescue
+      Headsail.error('Loaded API YAML file.')
     end
   end
 end

data/lib/headsail/redis.rb

@@ -14,6 +14,8 @@ module Headsail
     def add(data)
       @connection.incr(next_id_key)
       @connection.set(new_key, data)
+    rescue
+      setup_connection
     end
 
     private
@@ -32,6 +34,10 @@ module Headsail
 
     def setup_connection
       @connection = ::Redis.new(url: ENV['REDIS_URL'])
+      @connection.ping
+    rescue
+      Headsail.err("Failed to connect to Redis server at ENV 'REDIS_URL'.")
+      exit 1
     end
 
     def setup_service

data/lib/headsail/task.rb

@@ -1,6 +1,5 @@
 require 'concurrent'
 require 'headsail/api'
-require 'headsail/event'
 require 'headsail/http'
 require 'headsail/redis'
 
@@ -10,14 +9,24 @@ module Headsail
       @api = API.new(config)
       @redis = Redis.new(@api.name)
       @http = HTTP.new(@api)
-      @event = Event.new(@api.name)
+      Headsail.info("API Task '#{@api.name}' added.")
     end
 
     def run
       Concurrent::TimerTask.new(execution_interval: @api.timer) do
         @redis.add(@http.body) if @http.run
-        @event.request(@http, @api.method)
+        request_message
       end
     end
+
+    private
+
+    def request_message
+      @http.code_status == :SUCCESS ? Headsail.info(msg) : Headsail.err(msg)
+    end
+
+    def msg
+      "#{@api.name} / #{@api.method} REQUEST / #{@http.code} - #{@http.code_status.to_s}"
+    end
   end
 end

data/lib/headsail/util.rb

@@ -0,0 +1,13 @@
+module Headsail
+  def self.log
+    @logger ||= Logger.new(STDOUT)
+  end
+
+  def self.info(msg)
+    log.info("[ \e[32m#{'OK'}\e[0m ] #{msg}")
+  end
+
+  def self.err(msg)
+    log.info("[ \e[31m#{'ERR'}\e[0m ] #{msg}")
+  end
+end

data/lib/headsail/version.rb

@@ -1,3 +1,3 @@
 module Headsail
-  VERSION = "0.1.11"
+  VERSION = "0.1.12"
 end

data/lib/headsail.rb

@@ -1 +1,4 @@
+require 'headsail/cli'
+require 'headsail/util'
 require 'headsail/version'
+require 'byebug'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: headsail
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Nicholas Sweeting
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 description: Automated API data retrieval and storage.
 email:
 - nsweeting@gmail.com
@@ -118,12 +132,12 @@ files:
 - lib/headsail/cli.rb
 - lib/headsail/client.rb
 - lib/headsail/configure.rb
-- lib/headsail/event.rb
 - lib/headsail/http.rb
 - lib/headsail/launcher.rb
 - lib/headsail/oauth.rb
 - lib/headsail/redis.rb
 - lib/headsail/task.rb
+- lib/headsail/util.rb
 - lib/headsail/version.rb
 homepage: 
 licenses:

data/lib/headsail/event.rb

@@ -1,15 +0,0 @@
-require 'logger'
-
-module Headsail
-  class Event
-    def initialize(event_name)
-      @event_name = event_name
-      @logger = Logger.new(STDOUT)
-    end
-
-    def request(http, method)
-      message = "#{@event_name} / #{method} REQUEST / #{http.code} - #{http.code_status.to_s}"
-      @logger.info(message)
-    end
-  end
-end