headsail 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ace0f3b54772bdd03760cd0474f75ba198a6114
-  data.tar.gz: 33b1a7bdb77a95c0db3488dc1c400de5d6cb61ef
+  metadata.gz: d05989713cd84dd29b624623e2d7451ad3f79339
+  data.tar.gz: a5a110f049d8c1fa0f6d5b2097e14bc06620edc3
 SHA512:
-  metadata.gz: c70e330418ec1a6887ad6d3174007e237c8248fdbddcb1189023f336a1341d937f3931b99fc703a17f101e578cfb02240c191bb0f482052435e476869da313c3
-  data.tar.gz: aa9633fa61a0e43a8a2690c0173cbb2bda3063604b7b7c769ad303c26f445be0847d939211f156e34d65a74b3878f173976d10dceb2fe6115bd1a56ca2fb2e06
+  metadata.gz: 7c56d0dda0ebed50cd7a47008f5e8d1eb7d4db9537cd723cbdff1f23faaaaf9e5dc1d27a7960d03230c22957b993ebe11b2b098c074b565e7b2e027831486801
+  data.tar.gz: 8bc826cb18b1f5cf7dff5cb6ef5884fd7e7c33238eb429fc49aa8abb898980438d3e7be73224dd2b3017340ffe5a0599c7114c05cb116450abe7c98ff36b1c1c

data/.gitignore

@@ -1,5 +1,6 @@
 /.bundle/
 /.yardoc
+/.byebug_history
 /Gemfile.lock
 /bin/console
 /bin/setup

data/README.md

@@ -1,6 +1,6 @@
 # Headsail
 
-Headsail automates the task of API data retrieval and storage. Utilizing simple YAML files, we can create recurring API retrieval jobs, with the response being stored in a Redis DB.
+Headsail is a lightweight client framework for automating the task of API data retrieval and storage. Utilizing simple YAML files, we can create recurring API retrieval jobs, with the response being stored in a Redis DB.
 
 ## Installation
 
@@ -20,13 +20,7 @@ Or install it yourself as:
 
 ## Usage
 
-
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To come.
 
 ## Contributing
 

data/Rakefile

@@ -4,6 +4,7 @@ require "rake/testtask"
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
+  t.warning = false
   t.test_files = FileList['test/**/*_test.rb']
 end
 

data/examples/apis.yml

@@ -0,0 +1,23 @@
+-
+  name: Weather
+  timer: 20
+  request:
+    method: GET
+    uri: http://api.openweathermap.org/data/2.5/weather
+    params:
+      lat: '35'
+      lon: '139'
+      appid: <%= ENV['WEATHER_KEY'] %>
+-
+  name: Twitter
+  timer: 120
+  oauth:
+    consumer_key: <%= ENV['TWITTER_CONSUMER_KEY'] %>
+    consumer_secret: <%= ENV['TWITTER_CONSUMER_SECRET'] %>
+    access_token: <%= ENV['TWITTER_ACCESS_TOKEN'] %>
+    access_token_secret: <%= ENV['TWITTER_ACCESS_TOKEN_SECRET'] %>
+  request:
+    method: GET
+    uri: https://api.twitter.com/1.1/trends/place.json
+    params:
+      id: '1'

data/headsail.gemspec

@@ -10,15 +10,19 @@ Gem::Specification.new do |spec|
   spec.email         = ["nsweeting@gmail.com"]
   spec.summary       = "Automated API data retrieval and storage."
   spec.description   = "Automated API data retrieval and storage."
+  spec.homepage      = "https://github.com/nsweeting/headsail"
   spec.license       = "MIT"
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.executables   = ['headsail']
-  spec.require_paths = ["lib"]
+  spec.executables   = %w( headsail )
+  spec.require_paths = %w( lib )
+
   spec.add_runtime_dependency "redis", "~> 3.3"
   spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
   spec.add_runtime_dependency "oauth", "~> 0.5"
   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 "sinatra", "~> 1.4"
+  spec.add_development_dependency "webmock", "~> 2.1"
   spec.add_development_dependency "byebug", "~> 5.0"
 end

data/lib/headsail.rb

@@ -1,3 +1,3 @@
 require 'headsail/cli'
-require 'headsail/logs'
+require 'headsail/log'
 require 'headsail/version'

data/lib/headsail/api.rb

@@ -9,8 +9,7 @@ module Headsail
       @method = config['request']['method']
       @uri = build_uri(config['request'])
     rescue
-      Headsail.err('Improper API YAML format.')
-      exit 1
+      Headsail.err('Improper API YAML format.', :exit)
     end
 
     private

data/lib/headsail/cli.rb

@@ -6,7 +6,7 @@ module Headsail
   # Handles the start of Headsail via command line
   #
   class CLI
-    attr_reader :launcher
+    attr_reader :launcher, :configure
 
     # Creates a new CLI object, parsing the arguments that are passed to it,
     # and readying a Launcher to be run
@@ -56,8 +56,7 @@ module Headsail
     def parse_options
       @parser.parse!(@argv)
     rescue
-      Headsail.err('Unsupported options entered in CLI.')
-      exit 1
+      Headsail.err('Unsupported options entered in CLI.', :exit)
     end
   end
 end

data/lib/headsail/configure.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'erb'
 
 module Headsail
   class Configure
@@ -6,10 +7,11 @@ module Headsail
     attr_reader :apis
 
     def load_apis(path)
-      @apis = YAML.load_file(path)
+      @apis = YAML.load(ERB.new(File.read(path)).result)
+      fail if @apis == false
       Headsail.info('Loaded API YAML file.')
     rescue
-      Headsail.error('Loaded API YAML file.')
+      Headsail.err('Loading API YAML file.', :exit)
     end
   end
 end

data/lib/headsail/{logs.rb → log.rb}

@@ -9,10 +9,13 @@ module Headsail
     log.info("[ \e[32m#{'INFO'}\e[0m ] #{msg}")
   end
 
-  def self.err(msg)
+  def self.err(msg, action)
     log.info("[ \e[31m#{'ERROR'}\e[0m ] #{msg}")
+    exit 1 if action == :exit
   end
 
+  private
+
   def self.build_logger
     logger = Logger.new(STDOUT)
     logger.formatter = proc do |severity, datetime, progname, msg|

data/lib/headsail/redis.rb

@@ -7,47 +7,26 @@ module Headsail
     def initialize(key_name)
       @key_name = key_name
       setup_connection
-      setup_service
-      setup_next_id
+      setup_task
     end
 
     def add(data)
-      @connection.incr(next_id_key)
-      @connection.set(new_key, data)
+      @connection.lpush(@key_name, data)
     rescue
       setup_connection
     end
 
     private
 
-    def new_key
-      "#{@key_name}:#{next_id}"
-    end
-
-    def next_id
-      @connection.get(next_id_key)
-    end
-
-    def next_id_key
-      @next_id_key ||= "#{@key_name}:next_id"
-    end
-
     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
-      return if @connection.exists(@key_name)
-      @connection.set(@key_name, true)
-      @connection.lpush('apis', @key_name)
+      Headsail.err("Failed to connect to Redis server at ENV 'REDIS_URL'.", :exit)
     end
 
-    def setup_next_id
-      @connection.set(next_id_key, 0) unless @connection.exists(next_id_key)
+    def setup_task
+      @connection.sadd('apis', @key_name)
     end
   end
 end

data/lib/headsail/task.rb

@@ -22,7 +22,11 @@ module Headsail
     private
 
     def request_message
-      @http.code_status == :SUCCESS ? Headsail.info(msg) : Headsail.err(msg)
+      if @http.code_status == :SUCCESS
+        Headsail.info(msg)
+      else
+        Headsail.err(msg, :no_exit)
+      end
     end
 
     def msg

data/lib/headsail/version.rb

@@ -1,3 +1,3 @@
 module Headsail
-  VERSION = "0.1.15"
+  VERSION = "0.1.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: headsail
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Nicholas Sweeting
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-08 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -94,6 +94,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -123,9 +151,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
 - bin/headsail
-- bin/setup
+- examples/apis.yml
 - headsail.gemspec
 - lib/headsail.rb
 - lib/headsail/api.rb
@@ -134,12 +161,12 @@ files:
 - lib/headsail/configure.rb
 - lib/headsail/http.rb
 - lib/headsail/launcher.rb
-- lib/headsail/logs.rb
+- lib/headsail/log.rb
 - lib/headsail/oauth.rb
 - lib/headsail/redis.rb
 - lib/headsail/task.rb
 - lib/headsail/version.rb
-homepage: 
+homepage: https://github.com/nsweeting/headsail
 licenses:
 - MIT
 metadata: {}