slnky 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 511db9f81650717557115069f4f0c506835b6c3f
-  data.tar.gz: 7be97d4637c490cc2f758c3a464b3fdab7403b85
+  metadata.gz: 77b112accb022f9dd0533da6fe381c765d05b91b
+  data.tar.gz: 87ed869ce697d6e3a9952804297737fec5f02464
 SHA512:
-  metadata.gz: 8b1cd9411c9f2043de755e1eeb4c32675b0a70b638812fc6380f8db349fd6ceaa92ff34a26f793a8ed4d0d7e7557f44b6d904c201c504523beaf690bef148f64
-  data.tar.gz: c117a14627713d77259a47a39b3fd8504bcd1ff5a7234c6471c76635d2b9b3f004f0fff4aee7b7c0dce72808c979bfd3b249ae81e0f90a5ec0bc925fb6ef202d
+  metadata.gz: 8d7a928f9aad0803eed260afdd551b403217c9e8af6dad6ebc3e48380af75d38c164eab540f6fe1450e6022c6681c14f53447c4f7f2056f5769c43cea205aeab
+  data.tar.gz: c3b71ab7ec862c1848acef70c172d1d704c0f8275486d606f10ce533e96786aff9b55fffcabdc7bd8df23c71479cb03735f5cec81592118a43586d9d269bc3ad

data/lib/slnky/cli/generate.rb

@@ -4,7 +4,6 @@ module Slnky
       desc 'service NAME [DIR]', 'generate a service named NAME'
       def service(name, dir=nil)
         generator = Slnky::Generator::Service.new(name, dir)
-        raise Thor::Error, "error: directory '#{generator.dir}' exists" if File.exists?(generator.dir)
         generator.generate
       end
 

data/lib/slnky/cli.rb

@@ -11,6 +11,13 @@ end
 module Slnky
   module CLI
     class Main < Thor
+      map %w[--version -v] => :__print_version
+
+      desc "--version, -v", "print the version"
+      def __print_version
+        puts "Slnky version: #{Slnky::VERSION}"
+      end
+
       desc 'init', 'initialize configuration directory'
       def init
         dir = "#{ENV['HOME']}/.slnky"

data/lib/slnky/generator.rb

@@ -10,42 +10,82 @@ module Slnky
 
       def initialize(name, dir)
         @name = name
-        @dir = dir == nil ? "slnky-#{name}" : dir
+        @dir = File.expand_path(dir == nil ? "slnky-#{name}" : dir)
         short = self.class.name.split('::').last.downcase
         @template = File.expand_path("../template/#{short}", __FILE__)
       end
 
       def generate
-        # copy dir
-        puts "creating directory and processing templates..."
-        FileUtils.cp_r(@template, @dir)
-        puts "#{@dir}:"
-        # process templates
-        Find.find(@dir).each do |f|
-          next unless File.file?(f) && File.extname(f) == '.erb'
-          template(f)
-        end
+        puts "generating service #{@name}:"
+        puts "  from: #{@template}"
+        puts "  to:   #{@dir}"
+        process_files
         # make service executable
         `chmod 755 #{@dir}/service-slnky-#{@name}`
         # git init
         puts "initializing git..."
         `cd #{@dir} && git init . || true`
+        `cd #{@dir} && git add .`
       end
 
       protected
 
-      def template(file)
+      def process_files
+        Find.find(@template).each do |path|
+          next unless File.file?(path)
+          file = path.gsub(/^#{@template}\//, '')
+          ext = File.extname(path)
+          mkdir(File.dirname("#{@dir}/#{file}"))
+          if ext == '.erb'
+            tmpl(file)
+          else
+            file(file)
+          end
+        end
+      end
+
+      def mkdir(dir)
+        return if File.directory?(dir)
+        # puts "mkdir: #{dir}"
+        FileUtils.mkdir_p(dir)
+      end
+
+      def file(file)
+        # puts "file:  #{file}"
+        FileUtils.cp("#{@template}/#{file}", "#{@dir}/#{file}")
+      end
+
+      def tmpl(file)
+        # puts "tmpl:  #{file}"
+        path = "#{@template}/#{file}"
         var = {
             name: @name,
             dir: @dir
         }
-        dest = file.gsub(/\.erb$/, '').gsub('NAME', @name)
-        puts "  #{dest}"
-        template = Tilt.new(file)
+        out = file.gsub(/\.erb$/, '').gsub('NAME', @name)
+        dest = "#{@dir}/#{out}"
+        # puts "       #{dest}"
+        template = Tilt.new(path)
         output = template.render(self, var)
         File.write(dest, output)
-        FileUtils.rm(file) if file != dest
       end
+
+      # def generate_old
+      #   # copy dir
+      #   puts "creating directory and processing templates..."
+      #   FileUtils.cp_r(@template, @dir)
+      #   puts "#{@dir}:"
+      #   # process templates
+      #   Find.find(@dir).each do |f|
+      #     next unless File.file?(f) && File.extname(f) == '.erb'
+      #     template(f)
+      #   end
+      #   # make service executable
+      #   `chmod 755 #{@dir}/service-slnky-#{@name}`
+      #   # git init
+      #   puts "initializing git..."
+      #   `cd #{@dir} && git init . || true`
+      # end
     end
   end
 end

data/lib/slnky/service/exchanges.rb

@@ -0,0 +1,33 @@
+module Slnky
+  module Service
+    class Exchanges
+      def initialize(channel)
+        @channel = channel
+        @exchanges = {}
+      end
+
+      def create(name, overrides={})
+        options = {
+            type: :fanout
+        }.merge(overrides)
+        @exchanges[name] =
+            case options[:type]
+              when :fanout
+                @channel.fanout("slnky.#{name}")
+              else
+                raise "unknown exchange type: #{options[:type]}"
+            end
+      end
+
+      def [](name)
+        @exchanges["slnky.#{name}"] || @exchanges[name] || raise("no exchange found: #{name}")
+      end
+
+      def each
+        @exchanges.each do |name, exchange|
+          yield name, exchange
+        end
+      end
+    end
+  end
+end

data/lib/slnky/service/periodics.rb

@@ -0,0 +1,19 @@
+module Slnky
+  module Service
+    class Periodics
+      def initialize
+        @timers = []
+      end
+
+      def add(seconds, method)
+        @timers << {seconds: seconds, method: method}
+      end
+
+      def each
+        @timers.each do |timer|
+          yield timer['seconds'], timer['method']
+        end
+      end
+    end
+  end
+end

data/lib/slnky/service/queues.rb

@@ -0,0 +1,27 @@
+module Slnky
+  module Service
+    class Queues
+      def initialize(channel)
+        @channel = channel
+        @queues = {}
+      end
+
+      def create(name, exchange, overrides={})
+        options = {
+            durable: true
+        }.merge(overrides)
+        @queues[name] = @channel.queue("service.#{@name}.events", options).bind(exchange)
+      end
+
+      def [](name)
+        @queues["service.#{@name}.events"] || @queues[name] || raise("no queue found: #{name}")
+      end
+
+      def each
+        @queues.each do |name, exchange|
+          yield name, exchange
+        end
+      end
+    end
+  end
+end

data/lib/slnky/service/subscriptions.rb

@@ -0,0 +1,27 @@
+module Slnky
+  module Service
+    class Subscriptions
+      def initialize
+        @subs = []
+      end
+
+      def add(name, method)
+        @subs << {name: name, method: method}
+      end
+
+      def each
+        @subs.each do |sub|
+          yield sub[:name], sub[:method]
+        end
+      end
+
+      def for(name)
+        @subs.each do |sub|
+          if sub[:name] == name || File.fnmatch(sub[:name], name)
+            yield sub[:name], sub[:method] if block_given?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/slnky/service.rb

@@ -1,57 +1,66 @@
-require 'slnky/version'
-require 'slnky/message'
 require 'amqp'
 require 'open-uri'
 require 'json'
+require 'socket'
+
+require 'slnky/version'
+require 'slnky/message'
+require 'slnky/service/subscriptions'
+require 'slnky/service/periodics'
+require 'slnky/service/queues'
+require 'slnky/service/exchanges'
 
 module Slnky
   module Service
     class Base
-      def initialize(url, env='development')
+      attr_reader :config
+
+      def initialize(url, options={})
         @server = url
-        @environment = env
         @name = self.class.name.split('::').last.downcase
-        json = open("#{@server}/configs/#{@name}") {|f| f.read }
-        @config = JSON.parse(json)
-        @host = @config['rabbit']['host']
-        @port = @config['rabbit']['port']
-        @subscriptions = {}
-        @periodics = []
-        @exchanges = {}
+        @environment = options.delete(:env) || options.delete(:environment) || 'development'
+        @config = load_config(options)
+
+        @subscriptions = self.class.subscriptions || Slnky::Service::Subscriptions.new
+        @periodics = self.class.periodics || Slnky::Service::Periodics.new
+        @hostname = Socket.gethostname
+        @ipaddress = Socket.ip_address_list.find { |ai| ai.ipv4? && !ai.ipv4_loopback? }.ip_address
       end
 
       def start
-        AMQP.start("amqp://#{@host}:#{@port}") do |connection|
+        AMQP.start("amqp://#{config.rabbit.host}:#{config.rabbit.port}") do |connection|
           @channel = AMQP::Channel.new(connection)
           @channel.on_error do |ch, channel_close|
             raise "Channel-level exception: #{channel_close.reply_text}"
           end
-          @exchanges['events'] = @channel.fanout("slnky.events")
-          @exchanges['logs'] = @channel.fanout("slnky.logs")
 
-          log :info, "slnky.service.#{@name}: running"
+          @exchanges = Slnky::Service::Exchanges.new(@channel)
+          @exchanges.create('events')
+          @exchanges.create('logs')
+
+          @queues = Slnky::Service::Queues.new(@channel)
+          @queues.create(@name, @exchanges['events'])
+
+          log :info, "running"
 
           run
 
-          @subscriptions.each do |name, block|
-            log :info, "slnky.service.#{@name}: subscribed to: #{name}"
+          @subscriptions.each do |name, method|
+            log :info, "subscribed to: #{name} -> #{self.class.name}.#{method}"
           end
 
-          @channel.queue("service.#{@name}.events", durable: true).bind(@exchanges['events']).subscribe do |raw|
-            payload = parse(raw)
-            if @subscriptions[payload.name]
-              @subscriptions[payload.name].call(payload)
-            end
-            # TODO: support this better
-            if @subscriptions['*']
-              @subscriptions['*'].call(payload)
+          @queues[@name].subscribe do |raw|
+            message = parse(raw)
+            event = message.name
+            data = message.payload
+            @subscriptions.for(event) do |name, method|
+              self.send(method.to_sym, event, data)
             end
           end
 
-          @periodics.each do |p|
-            EventMachine.add_periodic_timer(p[:timer]) do
-              b = p[:block]
-              instance_eval &b
+          @periodics.each do |seconds, method|
+            EventMachine.add_periodic_timer(seconds) do
+              self.send(method.to_sym)
             end
           end
 
@@ -69,7 +78,7 @@ module Slnky
       protected
 
       def run
-        # nothing here
+        # nothing here - overridden in subclasses
       end
 
       def msg(data)
@@ -80,16 +89,57 @@ module Slnky
         Slnky::Message.parse(data)
       end
 
-      def subscribe(name, &block)
-        @subscriptions[name] = block
+      def subscribe(name, method)
+        raise "move this to class level, use methods instead of blocks"
+        # @subscriptions.add(name, method)
       end
 
-      def periodic(timer, &block)
-        @periodics << {timer: timer, block: block}
+      def periodic(seconds, method)
+        raise "move this to class level, use methods instead of blocks"
+        # @periodics.add(seconds, method)
       end
 
       def log(level, message)
-        @exchanges['logs'].publish(msg({service: "#{@name}-#{$$}", level: level, message: message}))
+        data = {
+            service: "#{@name}-#{$$}",
+            level: level,
+            hostname: @hostname,
+            ipaddress: @ipaddress,
+            message: "slnky.service.#{@name}: #{message}"
+        }
+        @exchanges['logs'].publish(msg(data)) if @exchanges && @exchanges['logs'] # only log to the exchange if it's created
+        puts "%s [%6s] %s" % [Time.now, data[:level], data[:message]] if development? # log to the console if in development
+      end
+
+      def development?
+        @environment == 'development'
+      end
+
+      def load_config(config)
+        # if you specify config, it will not load from server
+        # this is useful for testing, so you won't need to be running
+        # a server locally or configure your development service to
+        # talk to production server
+        if !config || config.count == 0
+          config = JSON.parse(open("#{@server}/configs/#{@name}") {|f| f.read })
+        end
+        DeepStruct.new(config)
+      end
+
+      class << self
+        attr_reader :subscriptions
+        attr_reader :periodics
+
+        def subscribe(name, method)
+          @subscriptions ||= Slnky::Service::Subscriptions.new
+          @subscriptions.add(name, method)
+        end
+
+        def periodic(seconds, method)
+          @periodics ||= Slnky::Service::Periodics.new
+          @periodics.add(seconds, method)
+        end
+        alias_method :timer, :periodic
       end
 
       # def pub(data)

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

@@ -8,4 +8,6 @@
 /tmp/
 /log/*
 /.env
+/slnky-cli/lib/slnky/template/service/deploy.env.erb
+/test/config.yaml
 /deploy.env

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

@@ -3,12 +3,13 @@ require 'slnky'
 module Slnky
   module Service
     class <%= name.capitalize %> < Base
-      def run
-        subscribe 'event.name' do |message|
-          name = message.name
-          data = message.payload
-          # do something
-        end
+      subscribe 'slnky.service.test', :handler
+      # you can also subscribe to heirarchies, this gets
+      # all events under something.happened
+      # subscribe 'something.happened.*', :other_handler
+
+      def handler(name, data)
+        name == 'slnky.service.test' && data.hello == 'world!'
       end
     end
   end

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

@@ -15,4 +15,4 @@ env = ARGV[1]
 # Become a daemon
 Daemons.daemonize if env == 'production'
 
-Slnky::Service::<%= name.capitalize %>.new(ENV['SLNKY_URL'], env).start
+Slnky::Service::<%= name.capitalize %>.new(ENV['SLNKY_URL'], env: env).start

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

@@ -1,7 +1,10 @@
 require 'spec_helper'
 
 describe Slnky::Service::<%= name.capitalize %> do
-  it 'does something useful' do
-    expect(false).to eq(true)
+  subject { described_class.new("http://localhost:3000", test_config) }
+  let(:test_event) { event_load('test')}
+
+  it 'handles event' do
+    expect(subject.handler(test_event.name, test_event.payload)).to eq(true)
   end
 end

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

@@ -1,2 +1,28 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require 'slnky'
 require 'slnky/service/<%= name %>'
+require 'yaml'
+require 'erb'
+require 'tilt'
+
+require 'dotenv'
+@dotenv = Dotenv.load
+
+def event_load(name)
+  @events ||= {}
+  @events[name] ||= begin
+    file = File.expand_path("../../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 test_config
+  @config ||= begin
+    file = File.expand_path("../../test/config.yaml", __FILE__)
+    template = Tilt.new(file)
+    output = template.render(self, @dotenv)
+    YAML.load(output)
+  end
+end
+

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

@@ -0,0 +1,7 @@
+---
+# config.yaml for Slnky::Service::Test
+# 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
+service: test # just an example

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

@@ -0,0 +1,7 @@
+---
+# config.yaml for Slnky::Service::<%= name.capitalize %>
+# 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
+service: <%= name %> # just an example

data/lib/slnky/template/service/test/events/test.json

@@ -0,0 +1,6 @@
+{
+  "name": "slnky.service.test",
+  "payload": {
+    "hello": "world!"
+  }
+}

data/lib/slnky/version.rb

@@ -1,3 +1,3 @@
 module Slnky
-  VERSION = "0.3.5"
+  VERSION = "0.4.0"
 end

data/slnky.gemspec

@@ -9,9 +9,9 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Shawn Catanzarite"]
   spec.email         = ["me@shawncatz.com"]
 
-  spec.summary       = %q{core slnky lib}
-  spec.description   = %q{core slnky lib}
-  spec.homepage      = "https://github.com/shawncatz/slnky"
+  spec.summary       = %q{core slnky lib and command line}
+  spec.description   = %q{core slnky lib and command line}
+  spec.homepage      = "https://github.com/slnky/slnky-cli"
   spec.license       = "MIT"
 
   # # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slnky
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Shawn Catanzarite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-05 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,7 +122,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.2
-description: core slnky lib
+description: core slnky lib and command line
 email:
 - me@shawncatz.com
 executables:
@@ -152,6 +152,10 @@ files:
 - lib/slnky/generator/service.rb
 - lib/slnky/message.rb
 - lib/slnky/service.rb
+- lib/slnky/service/exchanges.rb
+- lib/slnky/service/periodics.rb
+- lib/slnky/service/queues.rb
+- lib/slnky/service/subscriptions.rb
 - lib/slnky/template/service/.env.sample
 - lib/slnky/template/service/.gitignore.erb
 - lib/slnky/template/service/.rspec
@@ -162,16 +166,19 @@ files:
 - lib/slnky/template/service/config/deploy.rb.erb
 - lib/slnky/template/service/config/deploy/production.rb
 - lib/slnky/template/service/config/deploy/staging.rb
-- lib/slnky/template/service/deploy.env
+- lib/slnky/template/service/deploy.env.erb
 - lib/slnky/template/service/lib/capistrano/tasks/NAME.rake.erb
 - lib/slnky/template/service/lib/slnky/service/NAME.rb.erb
 - lib/slnky/template/service/log/.keep
 - lib/slnky/template/service/service-slnky-NAME.erb
 - lib/slnky/template/service/spec/slnky/service/NAME_spec.rb.erb
 - lib/slnky/template/service/spec/spec_helper.rb.erb
+- lib/slnky/template/service/test/config.yaml
+- lib/slnky/template/service/test/config.yaml.erb
+- lib/slnky/template/service/test/events/test.json
 - lib/slnky/version.rb
 - slnky.gemspec
-homepage: https://github.com/shawncatz/slnky
+homepage: https://github.com/slnky/slnky-cli
 licenses:
 - MIT
 metadata: {}
@@ -194,5 +201,5 @@ rubyforge_project:
 rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
-summary: core slnky lib
+summary: core slnky lib and command line
 test_files: []