slnky 0.9.5 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c51d287908f0a2b0cb4091a29bc8a814eee19342
-  data.tar.gz: 93ae42c86e7e592ef2d5aa6680481ecd26d6cfac
+  metadata.gz: d9205994e57ed75ad10a0fd88f243ef7e0fd95ed
+  data.tar.gz: d6314951e4589c72fcbbba5955d20cb34bf144cd
 SHA512:
-  metadata.gz: 8239559a093106ade370ad12a47beac436ed0e1df4429834e959a5519a2796627ecbf3fd7d934adc632c070a2de80096591fcf9fad4d82b3f95fdd4b1ea71da5
-  data.tar.gz: bb8cd8812ea59dc29edc272a3890b4e52abdfbb968ab91d58720551ebb3c5064b24255f2a9ed848cdac31d3a9a3206ae8756e4e1b4121e21b60b9169f2fd7537
+  metadata.gz: d531aecffb5b4c89d24a3c93765da9311cd3b361e519d6c4ef96006e3f0a1e41a0fdffeb75285a511a2ab41eabadb3fa62f3ce8fff0c90c05fb146bb94f52286
+  data.tar.gz: 0925cc60acbb0c0c15202f55a2e5df4df099674686f646335356493341a4dd72133a1fadf4c0b3467f3ffb0006ce690f482aaec2962826314ddb2f49e40d0f8c

data/lib/slnky/cli/command.rb

@@ -1,6 +1,7 @@
 module Slnky
   module CLI
     class Command < Base
+      # option %w{-s --server}, '[SERVER]', 'set server url', environment_variable: 'SLNKY_SERVER'
       option %w{-n --dry-run}, :flag, "just output the event, don't send"
       option %w{-t --timeout}, '[TIMEOUT]', "time to wait for response in seconds", default: 10 do |t|
         Integer(t)
@@ -15,13 +16,13 @@ module Slnky
 
       def execute
         @name = service
+        Slnky::Config.configure(@name, environment: environment)
         data = {
             name: "slnky.#{service}.command",
             command: service == 'help' ? nil : command,
             args: args,
             response: "command-#{$$}",
         }
-        Slnky::Config.configure('cli')
         msg = Slnky::Message.new(data)
         puts JSON.pretty_generate(msg.to_h) if dry_run?
         amqp(msg) unless dry_run?

data/lib/slnky/cli/service.rb

@@ -6,7 +6,6 @@ module Slnky
           n.gsub(/^slnky-/, '')
         end
         # option %w{-f --force}, :flag, "force overwrite of files"
-        option %w{-e --environment}, '[ENV]', 'the environment to run under', default: 'development', environment_variable: 'SLNKY_ENV'
         def execute
           lib = File.expand_path("#{Dir.pwd}/lib", __FILE__)
           $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)

data/lib/slnky/cli.rb

@@ -14,13 +14,15 @@ module Slnky
         exit(0)
       end
 
-      option %w{-c --config}, '[CONFIG]', 'set config directory location', default: '~/.slnky', environment_variable: 'SLNKY_CONFIG' do |c|
-        p = File.expand_path("#{c}/config.yaml")
-        Slnky.load_config(p)
-        c
+      option %w{-c --config}, '[CONFIG]', 'set config directory location', default: '~/.slnky/config.yaml', environment_variable: 'SLNKY_CONFIG' do |c|
+        ENV['SLNKY_CONFIG'] = c
+      end
+      option %w{-s --server}, '[URL]', 'set server url', environment_variable: 'SLNKY_URL' do |u|
+        ENV['SLNKY_URL'] = u
+      end
+      option %w{-e --environment}, '[ENV]', 'the environment to run under', default: 'development', environment_variable: 'SLNKY_ENV' do |e|
+        ENV['SLNKY_ENV'] = e
       end
-
-      option %w{-s --server}, '[URL]', 'set server url', environment_variable: 'SLNKY_URL'
     end
 
     class Main < Base
@@ -32,7 +34,9 @@ module Slnky
           FileUtils.mkdir_p(dir)
           defaults = {
               slnky: {
-                  url: server
+                  development: {
+                    url: server
+                  }
               }
           }.deep_stringify_keys
           File.open("#{dir}/config.yaml", "w+") { |f| f.write(defaults.to_yaml) }

data/lib/slnky/client.rb

@@ -0,0 +1,23 @@
+module Slnky
+  module Client
+    class Base
+      def initialize
+
+      end
+
+      protected
+
+      def config
+        Slnky.config
+      end
+
+      def log
+        Slnky.log
+      end
+    end
+
+    class Mock < Base
+
+    end
+  end
+end

data/lib/slnky/command/response.rb

@@ -4,8 +4,9 @@ module Slnky
       attr_reader :log
 
       def initialize(route, service)
+        Slnky.config.service = service
         @route = route
-        @service = Slnky::System.pid(service)
+        @service = Slnky::System.pid
         @started = false
         @log = []
       end

data/lib/slnky/config.rb

@@ -16,16 +16,16 @@ module Slnky
   class Config < Data
     class << self
       def configure(name, config={})
+        config.deep_stringify_keys!
         @name = name
-        @config ||= begin
-          config['service'] = name
-          config['environment'] ||= 'development'
-          file = ENV['SLNKY_CONFIG']||"~/.slnky/config.yaml"
-          config.merge!(config_file(file))
-          server = ENV['SLNKY_URL']||config['url']
-          config.merge!(config_server(server))
-          self.new(config)
-        end
+        @environment = ENV['SLNKY_ENV'] || config['environment'] || 'development'
+        config['service'] = name
+        config['environment'] = @environment
+        file = ENV['SLNKY_CONFIG']||"~/.slnky/config.yaml"
+        config.merge!(config_file(file))
+        server = ENV['SLNKY_URL']||config['url']
+        config.merge!(config_server(server))
+        @config = self.new(config)
       end
 
       # def load_file(file)
@@ -52,8 +52,10 @@ module Slnky
         return {} unless File.exists?(path)
         template = Tilt::ERBTemplate.new(path)
         output = template.render(self, {})
-        d = YAML.load(output)
-        d['slnky'] ? d['slnky'] : d
+        cfg = YAML.load(output)
+        cfg = cfg['slnky'] || cfg
+        cfg = cfg[@environment] || cfg
+        cfg
       rescue => e
         puts "failed to load file #{file}: #{e.message}"
         {}

data/lib/slnky/log.rb

@@ -22,7 +22,7 @@ module Slnky
       @response = false
       case @config.environment
         when 'production'
-          @local   = false
+          @local   = Slnky::Log::Local.new
           @service = Slnky::Log::Service.new
         when 'test'
           @local   = false
@@ -35,6 +35,10 @@ module Slnky
 
     [:debug, :info, :warn, :error].each do |l|
       define_method(l) do |message|
+        # bl = @local ? 'x' : 'o'
+        # br = @remote ? 'x' : 'o'
+        # bs = @response ? 'x' : 'o'
+        # puts "#{l}:#{bl}#{br}#{bs} #{message}"
         log(l, message)
       end
     end
@@ -69,6 +73,9 @@ module Slnky
       def initialize
         super
         @logger = Logger.new(STDOUT)
+        @logger.formatter = proc do |severity, datetime, progname, msg|
+          "%-5s %s: %s: %s\n" % [severity, datetime, Slnky::System.pid, msg]
+        end
       end
 
       protected
@@ -85,28 +92,31 @@ module Slnky
 
       def initialize
         super
-        @service = Slnky::System.pid('unknown')
+        @service = Slnky::System.pid
         @hostname = Slnky::System.hostname
         @ipaddress = Slnky::System.ipaddress
-        @transport = Slnky::Transport.instance
-        @exchange = nil
-        if @transport
-          @exchange = @transport.exchanges['logs']
-        end
       end
 
       protected
 
       def log(level, message)
-        return unless @exchange
+        return unless exchange
         data = {
-            service: "#{@name}-#{$$}",
+            service: @service,
             level: level,
             hostname: @hostname,
             ipaddress: @ipaddress,
             message: message
         }
-        @exchange.publish(msg(data))
+        exchange.publish(msg(data))
+      end
+
+      def transport
+        @transport ||= Slnky::Transport.instance
+      end
+
+      def exchange
+        @exchange ||= transport.exchanges['logs']
       end
 
       def msg(data)

data/lib/slnky/service.rb

@@ -13,13 +13,12 @@ module Slnky
 
       def initialize
         config.service = name
-        @environment = config.environment
         @server_down = false
       end
 
       def start
         transport.start!(self) do |_|
-          log.info "running"
+          log.info "#{config.service} running #{config.environment}"
           run
 
           subscriber.add "slnky.#{name}.command", :handle_command

data/lib/slnky/system.rb

@@ -3,7 +3,8 @@ require 'socket'
 module Slnky
   class System
     class << self
-      def pid(service)
+      def pid
+        service = Slnky.config.service || 'unknown'
         "#{ipaddress}/#{service}-#{$$}"
       end
 

data/lib/slnky/template/service/lib/slnky/NAME/client.rb.erb

@@ -1,11 +1,12 @@
 module Slnky
   module <%= cap %>
-    class Client
-      def initialize(config)
-
+    class Client < Slnky::Client::Base
+      def initialize
+        # you can load any configurations from the server here
+        # @param = config.<%= name %>.param
       end
 
-
+      # implement communications with supporting services
     end
   end
 end

data/lib/slnky/template/service/lib/slnky/NAME/command.rb.erb

@@ -6,9 +6,24 @@ module Slnky
         @client ||= Slnky::<%= cap %>::Client.new(config)
       end
 
-      def echo(request, response)
-        args = request.arguments||[]
-        response.output = args.join(" ")
+      # use docopt to define arguments and options
+      command :echo, 'respond with the given arguments', <<-USAGE.strip_heredoc
+        Usage: echo [options] ARGS...
+
+        -h --help           print help.
+        -x --times=TIMES    print x times [default: 1].
+      USAGE
+
+      # handler methods receive request, response, and options objects
+      def handle_echo(request, response, opts)
+        # parameters (non-option arguments) are available as accessors
+        args = opts.args
+        # as are the options themselves (by their 'long' name)
+        1.upto(opts.times.to_i) do |i|
+          # just use the log object to respond, it will automatically send it
+          # to the correct channel.
+          log.info args.join(" ")
+        end
       end
     end
   end

data/lib/slnky/template/service/lib/slnky/NAME/mock.rb.erb

@@ -1,11 +1,13 @@
 module Slnky
   module <%= cap %>
-    class Mock
-      def initialize(config)
+    class Mock < Slnky::<%= cap %>::Client
+      # unless there's something special you need to do in the initializer
+      # use the one provided by the actual client object
+      # def initialize
+      #
+      # end
 
-      end
-
-      
+      # override methods of the client here to mock them for testing
     end
   end
 end

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

@@ -6,12 +6,12 @@ module Slnky
         @client ||= Slnky::<%= cap %>::Client.new(config)
       end
 
-      subscribe 'slnky.service.test', :handler
+      subscribe 'slnky.service.test', :handle_test
       # you can also subscribe to heirarchies, this gets
       # all events under something.happened
       # subscribe 'something.happened.*', :other_handler
 
-      def handler(name, data)
+      def handle_test(name, data)
         name == 'slnky.service.test' && data.hello == 'world!'
       end
     end

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

@@ -12,7 +12,9 @@ describe Slnky::<%= cap %>::Command do
   let(:help_response) { slnky_response('test-route', 'spec') }
 
   it 'handles echo' do
+    # make sure the command handler does not raise an error
     expect { subject.handle(echo.name, echo.payload, echo_response) }.to_not raise_error
+    # validate that the correct output is available in the response object
     expect(echo_response.log).to include("test echo")
   end
 

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

@@ -9,6 +9,7 @@ describe Slnky::<%= cap %>::Service do
   let(:test_event) { event_load('test')}
 
   it 'handles event' do
-    expect(subject.handler(test_event.name, test_event.payload)).to eq(true)
+    # test that the handler method receives and responds correctly
+    expect(subject.handle_test(test_event.name, test_event.payload)).to eq(true)
   end
 end

data/lib/slnky/template/service/test/config.yaml.erb

@@ -3,5 +3,5 @@
 # this file is processed through ERB, you can inject
 # values into the config from the environment, by specifying them
 # in the .env file
-environment: development # should specify this
+environment: test # should specify this
 service: <%= name %> # just an example

data/lib/slnky/version.rb

@@ -1,3 +1,3 @@
 module Slnky
-  VERSION = "0.9.5"
+  VERSION = "0.10.0"
 end

data/lib/slnky.rb

@@ -9,8 +9,9 @@ require 'slnky/config'
 require 'slnky/log'
 require 'slnky/system'
 require 'slnky/message'
-require 'slnky/service'
 require 'slnky/transport'
+require 'slnky/service'
+require 'slnky/client'
 require 'slnky/command'
 
 module Slnky

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slnky
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.10.0
 platform: ruby
 authors:
 - Shawn Catanzarite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -207,6 +207,7 @@ files:
 - lib/slnky/cli/generate.rb
 - lib/slnky/cli/notify.rb
 - lib/slnky/cli/service.rb
+- lib/slnky/client.rb
 - lib/slnky/command.rb
 - lib/slnky/command/request.rb
 - lib/slnky/command/response.rb