slnky 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f463d4a733b0c60374a3a454f61cab9e87be031
-  data.tar.gz: c250fa9638bd70abc1fbc9d02bf74c56d56b847d
+  metadata.gz: 37ab3b0c1f8e28e91be149e5500fca4ce689b91b
+  data.tar.gz: 8f5dc8b34b0042c7ee44f636b3441da878ef3198
 SHA512:
-  metadata.gz: dd296841c43e2b34a48cd92a93080efbf146d5ddd71ace7d0c8cba47952b1bb987f906173f1ced9d9a4d3a88026386067c71234e4ab58f5f0a12c5f5013c91e2
-  data.tar.gz: e06bcf6700821592792b287480aec22cb2320374938f8c48c4e4e5971d183cb6f979caa865b5c89105a186f941b11b116e71a9f66068aa1ced2680b2df0ccda2
+  metadata.gz: 11787283f2e825eebb57cfd22b387447101a5f8f9bff2de344ed325a14c77c10202d28c616e10da0c430f1da77b4288ce4ed4475df9aec427ecec4ee4d41034e
+  data.tar.gz: a786cfd4158b024e21b7f70a58566d72be0d6c2d3768146c9f8323dc055d92305eddc741956522f58762b81f5b19e0bb4f3355f88fcb9ad349c7968352d01752

data/lib/capistrano/slnky/templates/upstart.conf.erb

@@ -14,4 +14,4 @@ export SLNKY_SCRIPT
 exec start-stop-daemon --start \
     --chdir ${SLNKY_DIR} \
     --make-pidfile --pidfile ${SLNKY_DIR}/tmp/pids/${SLNKY_SERVICE}.pid \
-    --exec /usr/local/rvm/bin/rvm -- ${SLNKY_RVM} do bundle exec ./${SLNKY_SCRIPT} production
+    --exec /usr/local/rvm/bin/rvm -- ${SLNKY_RVM} do bundle exec slnky service run -e production $SLNKY_SERVICE

data/lib/slnky/command.rb

@@ -10,10 +10,10 @@ module Slnky
         @commands = self.class.commands
       end
 
-      def handle(event, data)
+      def handle(event, data, response=nil)
         begin
           req = Slnky::Command::Request.new(data)
-          res = Slnky::Command::Response.new(data.response, name)
+          res = response || Slnky::Command::Response.new(data.response, name)
           log.response = res
           res.start!
 
@@ -48,8 +48,6 @@ module Slnky
           end
         rescue Docopt::Exit => e
           log.info e.message
-        rescue => e
-          log.error "error in #{req.command}: #{e.message} at #{e.backtrace.first}"
         end
       end
 

data/lib/slnky/command/response.rb

@@ -1,17 +1,18 @@
 module Slnky
   module Command
     class Response
+      attr_reader :log
+
       def initialize(route, service)
-        @transport = Slnky::Transport.instance
-        @channel = @transport.channel
-        @exchange = @transport.exchanges['response']
         @route = route
         @service = Slnky::System.pid(service)
-        start!
+        @started = false
+        @log = []
       end
 
       [:info, :warn, :error].each do |l|
         define_method(l) do |message|
+          start! unless @started
           pub l, message
         end
       end
@@ -22,12 +23,17 @@ module Slnky
 
       def start!
         pub :start, "start"
+        @started = true
       end
 
       def done!
         pub :complete, "complete"
       end
 
+      def exchange=(exchange)
+        @exchange = exchange
+      end
+
       private
 
       def msg(level, message)
@@ -36,7 +42,20 @@ module Slnky
 
       def pub(level, message)
         # puts "#{level} #{message}"
-        @exchange.publish(msg(level, message), routing_key: @route)
+        exchange.publish(msg(level, message), routing_key: @route)
+        @log << message
+      end
+
+      def exchange
+        @exchange ||= transport.exchanges['response']
+      end
+
+      def transport
+        @transport ||= Slnky::Transport.instance
+      end
+
+      def channel
+        @channel ||= transport.channel
       end
     end
   end

data/lib/slnky/config.rb

@@ -1,4 +1,10 @@
 require 'open-uri'
+require 'json'
+require 'yaml'
+require 'erb'
+require 'tilt'
+require 'dotenv'
+Dotenv.load
 
 module Slnky
   class << self
@@ -14,7 +20,7 @@ module Slnky
         @config ||= begin
           config['service'] = name
           config['environment'] ||= 'development'
-          file = ENV['SLINKY_CONFIG']||"~/.slnky/config.yaml"
+          file = ENV['SLNKY_CONFIG']||"~/.slnky/config.yaml"
           config.merge!(config_file(file))
           server = ENV['SLNKY_SERVER'] || config['url']
           config.merge!(config_server(server))
@@ -43,14 +49,22 @@ module Slnky
       def config_file(file)
         path = File.expand_path(file)
         return {} unless File.exists?(path)
-        d = YAML.load_file(path) rescue {}
+        template = Tilt::ERBTemplate.new(path)
+        output = template.render(self, {})
+        d = YAML.load(output)
         d['slnky'] ? d['slnky'] : d
+      rescue => e
+        puts "failed to load file #{file}: #{e.message}"
+        {}
       end
 
       def config_server(server)
         return {} unless server
         server = "https://#{server}" unless server =~ /^http/
-        JSON.parse(open("#{server}/configs/#{@name}") { |f| f.read }) rescue {}
+        JSON.parse(open("#{server}/configs/#{@name}") { |f| f.read })
+      rescue => e
+        puts "failed to load server #{server}: #{e.message}"
+        {}
       end
     end
 

data/lib/slnky/spec/helper.rb

@@ -0,0 +1,36 @@
+require 'json'
+require 'yaml'
+require 'erb'
+require 'tilt'
+require 'dotenv'
+require 'slnky'
+
+def slnky_event(name)
+  @events ||= {}
+  @events[name] ||= begin
+    file = File.expand_path("#{Dir.pwd}/test/events/#{name}.json", __FILE__)
+    raise "file #{file} not found" unless File.exists?(file)
+    Slnky::Message.new(JSON.parse(File.read(file)))
+  end
+end
+
+def slnky_command(name)
+  @commands ||= {}
+  @commands[name] ||= begin
+    file = File.expand_path("#{Dir.pwd}/test/commands/#{name}.json", __FILE__)
+    raise "file #{file} not found" unless File.exists?(file)
+    Slnky::Command::Request.new(JSON.parse(File.read(file)))
+  end
+end
+
+def slnky_response(route, service)
+  @responses ||= {}
+  @responses[route] ||= begin
+    response = Slnky::Command::Response.new(route, service)
+    response.exchange = Slnky::Transport::MockExchange.new
+    response
+  end
+end
+
+ENV['SLNKY_CONFIG'] = File.expand_path("#{Dir.pwd}/test/config.yaml", __FILE__)
+Slnky::Config.configure('spec')

data/lib/slnky/template/service/Gemfile.erb

@@ -8,6 +8,7 @@ gem 'capistrano', '~> 3.4.0'
 gem 'capistrano-rvm', '~> 0.1.2'
 gem 'capistrano-bundler', '~> 1.1.4'
 gem 'airbrussh', '~> 0.8.0'
+gem 'travis', '~> 1.8.2'
 
 gem 'rspec'
 gem 'rake'

data/lib/slnky/template/service/Rakefile.erb

@@ -0,0 +1,20 @@
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec
+
+namespace :travis do
+  desc 'load .env variables into travis env'
+  task :env do
+    # use this to push variables to travis
+    # the names are the lower case names of the env
+    # variables set in your .env file
+    # %w{env_var_name}.each do |w|
+    #   key = w.upcase
+    #   `travis env set -- #{key} '#{ENV[key]}'`
+    # end
+  end
+end
+
+task :run do
+  sh "slnky service run <%= name %>"
+end

data/lib/slnky/template/service/spec/slnky/NAME/command_spec.rb.erb

@@ -2,16 +2,22 @@ require 'spec_helper'
 
 describe Slnky::<%= cap %>::Command do
   subject do
-    s = described_class.new("http://localhost:3000", test_config)
-    s.client = Slnky::<%= cap %>::Mock.new(test_config)
+    s = described_class.new
+    s.client = Slnky::<%= cap %>::Mock.new
     s
   end
-  let(:echo) { command('echo').payload }
-  let(:response) { Slnky::Command::Response.new() }
+  let(:echo) { slnky_command('echo') }
+  let(:help) { slnky_command('help') }
+  let(:echo_response) { slnky_response('test-route', 'spec') }
+  let(:help_response) { slnky_response('test-route', 'spec') }
 
   it 'handles echo' do
-    resp = response
-    expect(subject.echo(echo, resp)).not_to raise_error
-    expect(resp.output).to eq("test echo")
+    expect { subject.handle(echo.name, echo.payload, echo_response) }.to_not raise_error
+    expect(echo_response.log).to include("test echo")
+  end
+
+  it 'handles help' do
+    expect { subject.handle(help.name, help.payload, help_response) }.to_not raise_error
+    expect(help_response.log).to include("<%= name %> help: print help")
   end
 end

data/lib/slnky/template/service/spec/slnky/NAME/service_spec.rb.erb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe Slnky::<%= cap %>::Service do
   subject do
-    s = described_class.new("http://localhost:3000", test_config)
-    s.client = Slnky::<%= cap %>::Mock.new(test_config)
+    s = described_class.new
+    s.client = Slnky::<%= cap %>::Mock.new
     s
   end
   let(:test_event) { event_load('test')}

data/lib/slnky/template/service/spec/spec_helper.rb.erb

@@ -1,38 +1,3 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'slnky'
-require 'slnky/<%= name %>'
-require 'yaml'
-require 'erb'
-require 'tilt'
-
-require 'dotenv'
-@dotenv = Dotenv.load
-
-def event(name)
-  @events ||= {}
-  @events[name] ||= begin
-    file = File.expand_path("../../test/events/#{name}.json", __FILE__)
-    raise "file #{file} not found" unless File.exists?(file)
-    Slnky::Data.new(JSON.parse(File.read(file)))
-  end
-end
-
-def command(name)
-  @commands ||= {}
-  @commands[name] ||= begin
-    file = File.expand_path("../../test/commands/#{name}.json", __FILE__)
-    raise "file #{file} not found" unless File.exists?(file)
-    Slnky::Command::Request.new(JSON.parse(File.read(file)))
-  end
-end
-
-def test_config
-  @config ||= begin
-    file = File.expand_path("../../test/config.yaml", __FILE__)
-    template = Tilt::ERBTemplate.new(file)
-    output = template.render(self, @dotenv)
-    cfg = Slnky::Data.new(YAML.load(output))
-    cfg.environment = 'test'
-    cfg
-  end
-end
+require 'slnky/spec/helper'
+require 'slnky/chef'

data/lib/slnky/template/service/test/commands/help.json

@@ -0,0 +1,9 @@
+{
+  "name": "slnky.help.command",
+  "payload": {
+    "command": "help",
+    "args": [
+    ],
+    "responder": "STDOUT"
+  }
+}

data/lib/slnky/transport.rb

@@ -94,5 +94,15 @@ module Slnky
         @queues[desc] ||= @channel.queue(name, options).bind(@exchanges[exchange], bindoptions)
       end
     end
+
+    class MockExchange
+      def initialize
+        @verbose = false
+      end
+
+      def publish(object, options={})
+        puts "publish: #{object.inspect}: #{options.inspect}" if @verbose
+      end
+    end
   end
 end

data/lib/slnky/version.rb

@@ -1,3 +1,3 @@
 module Slnky
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slnky
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Shawn Catanzarite
@@ -221,6 +221,7 @@ files:
 - lib/slnky/service.rb
 - lib/slnky/service/subscriber.rb
 - lib/slnky/service/timer.rb
+- lib/slnky/spec/helper.rb
 - lib/slnky/system.rb
 - lib/slnky/template/service/.env.sample
 - lib/slnky/template/service/.gitignore.erb
@@ -230,7 +231,7 @@ files:
 - lib/slnky/template/service/CODE_OF_CONDUCT.md
 - lib/slnky/template/service/Capfile
 - lib/slnky/template/service/Gemfile.erb
-- lib/slnky/template/service/Rakefile
+- lib/slnky/template/service/Rakefile.erb
 - lib/slnky/template/service/config/deploy.rb.erb
 - lib/slnky/template/service/config/deploy/production.rb
 - lib/slnky/template/service/config/deploy/staging.rb
@@ -242,11 +243,11 @@ files:
 - lib/slnky/template/service/lib/slnky/NAME/mock.rb.erb
 - lib/slnky/template/service/lib/slnky/NAME/service.rb.erb
 - lib/slnky/template/service/log/.keep
-- lib/slnky/template/service/service-slnky-NAME.erb
 - lib/slnky/template/service/spec/slnky/NAME/command_spec.rb.erb
 - lib/slnky/template/service/spec/slnky/NAME/service_spec.rb.erb
 - lib/slnky/template/service/spec/spec_helper.rb.erb
 - lib/slnky/template/service/test/commands/echo.json.erb
+- lib/slnky/template/service/test/commands/help.json
 - lib/slnky/template/service/test/config.yaml.erb
 - lib/slnky/template/service/test/events/test.json
 - lib/slnky/transport.rb

data/lib/slnky/template/service/Rakefile

@@ -1,3 +0,0 @@
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
-task :default => :spec

data/lib/slnky/template/service/service-slnky-NAME.erb

@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-require 'rubygems'
-require 'bundler/setup'
-require 'dotenv'
-require 'daemons'
-require 'slnky/<%= name %>'
-Dotenv.load
-
-env = ARGV[0]
-
-# Become a daemon
-# Daemons.daemonize if env == 'production'
-
-Slnky::<%= cap %>::Service.new(ENV['SLNKY_URL'], environment: env).start