slnky 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f65c525ee1c0e5b8353167e9c4743b689a2b170
-  data.tar.gz: 2085c6eca48786416dd0dab2cdd6016bcbfec5c0
+  metadata.gz: eb1a2cf60af39bc1f8527438296e6960c6c5f258
+  data.tar.gz: 86dc87e48e935e746ab38192df0ff11bc30b3e37
 SHA512:
-  metadata.gz: 13541107935b35a65da3ef4bc3c1a191a718281b063e280361f647f26a8d428e4356f64dcceb3099334a8b323ecc1d86d2971babe20ee72e30288ef6e660e23f
-  data.tar.gz: c3ea6524cf2cf2436f0c1923d84b28a550323a7622857ae42df1d6c8d4586666f28509b4c97a79c8f2c88e01a3a3d332f15d48fdf665e824d3a83dd917c6ecc7
+  metadata.gz: 75311b244e94a31513dd13f0a827d42190c83d8b03aa682cc3d9fd4a60dac761771b8305a9f2b0fcb7661d14e1e79ef7e47273800e50285bc3114b9fcbfe62d8
+  data.tar.gz: 2cfd7f0987911b410db2c331003f1353dacbc6242547426073ace4e181f41b126a5bac58c1d84cf67a68c3015c7d07d785eab5ca8fac51b6910d1ea998a71e4b

data/lib/capistrano/tasks/slnky.rake

@@ -33,4 +33,11 @@ end
 
 namespace :deploy do
   after :publishing, 'slnky:restart'
+
+  desc "push deploy.env to service's shared_path on the server"
+  task :dotenv do
+    on roles :app do
+      upload! 'deploy.env', "#{shared_path}/.env"
+    end
+  end
 end

data/lib/slnky/generator.rb

@@ -1,5 +1,6 @@
 require 'erb'
 require 'tilt'
+require 'find'
 
 module Slnky
   module Generator
@@ -20,10 +21,12 @@ module Slnky
         FileUtils.cp_r(@template, @dir)
         puts "#{@dir}:"
         # process templates
-        Dir["#{@dir}/**/*"].each do |f|
+        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`
         # git init
         puts "initializing git..."
         `cd #{@dir} && git init . || true`

data/lib/slnky/service.rb

@@ -2,6 +2,7 @@ require 'slnky/version'
 require 'slnky/message'
 require 'amqp'
 require 'open-uri'
+require 'json'
 
 module Slnky
   module Service
@@ -9,7 +10,8 @@ module Slnky
       def initialize(url)
         @server = url
         @name = self.class.name.split('::').last.downcase
-        @config = open("#{@server}/configs/#{@name}") {|f| f.read }
+        json = open("#{@server}/configs/#{@name}") {|f| f.read }
+        @config = JSON.parse(json)
         @host = @config['rabbit']['host']
         @port = @config['rabbit']['port']
         @subscriptions = {}
@@ -39,6 +41,10 @@ module Slnky
             if @subscriptions[payload.name]
               @subscriptions[payload.name].call(payload)
             end
+            # TODO: support this better
+            if @subscriptions['*']
+              @subscriptions['*'].call(payload)
+            end
           end
 
           @periodics.each do |p|

data/lib/slnky/template/service/{.gitignore → .gitignore.erb}

@@ -7,4 +7,6 @@
 /pkg/
 /spec/reports/
 /tmp/
-.env
+/log/*
+/.env
+/deploy.env

data/lib/slnky/template/service/{Gemfile → Gemfile.erb}

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'slnky', github: 'shawncatz/slnky', branch: 'master'
+gem 'slnky', '~> <%= Slnky::VERSION %>'
 gem 'daemons', '~> 1.2.3'
 gem 'dotenv', '~> 2.1.0'
 

data/lib/slnky/template/service/deploy.env

@@ -0,0 +1,4 @@
+# SLNKY Services just need to know the server to get their configuration
+# This file is for production
+# run "cap production deploy:dotenv" to push to the server
+SLNKY_URL="https://domain.com"

data/lib/slnky/template/service/upstart/init.conf.erb

@@ -2,5 +2,5 @@ start on started networking
 respawn
 script
     cd /srv/<%= dir %>/current
-    rvm 2.2.2@slnky do bundle exec ./service run
+    /usr/local/rvm/bin/rvm `cat .ruby-version`@`cat .ruby-gemset` do bundle exec ./service run
 end script

data/lib/slnky/version.rb

@@ -1,3 +1,3 @@
 module Slnky
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slnky
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Shawn Catanzarite
@@ -151,17 +151,19 @@ files:
 - lib/slnky/message.rb
 - lib/slnky/service.rb
 - lib/slnky/template/service/.env.sample
-- lib/slnky/template/service/.gitignore
+- lib/slnky/template/service/.gitignore.erb
 - lib/slnky/template/service/.rspec
 - lib/slnky/template/service/.travis.yml
 - lib/slnky/template/service/CODE_OF_CONDUCT.md
 - lib/slnky/template/service/Capfile
-- lib/slnky/template/service/Gemfile
+- lib/slnky/template/service/Gemfile.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
+- lib/slnky/template/service/deploy.env
 - 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.erb
 - lib/slnky/template/service/spec/slnky/service/NAME_spec.rb.erb
 - lib/slnky/template/service/spec/spec_helper.rb.erb