slnky 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad012b2c490543ade16d3cd04419aa0d14d6f9e0
-  data.tar.gz: bfd7e4f870db6a0f238a8ef2b44b21028ca02d16
+  metadata.gz: 477bf08c5bdd20d0a2abf503ab78f50a70e4e3ad
+  data.tar.gz: 1f10dc0f2b82bb25753048de854d9e711a23fc04
 SHA512:
-  metadata.gz: d7c5d0cbc44557292dffcb12215ed1e474a188a1c79e47108091fff00b154d1fe549573385965c4d12deb24dab7b70cbbb650c66953d6429d2b8fe3e892e3e27
-  data.tar.gz: c8455010c8e9456827e6776bf3bf7df237d3cb3aff2d8306ed3d1a55929729822464b2f0b86ce04edd41b2993ec7af135ca9d1e085ed26e50878bcc1d7ab7bd4
+  metadata.gz: 6ba8be43abde4f269d305ca5061a0e1f84913f6b68ac97d46b74a3534df8e722c481cb244f5bafa4e9b18492b60d93eb5c7ba65e946da48ac6c7b9a21ffffd5d
+  data.tar.gz: 55eea47aafc19ddcf0b232afcafadf1020a04972dd90bc3fd82c5265a12d166ae5eb36c59ff0dfcfcaccba83c12b685567a15536fb3ccc51cafab802166d7b39

data/lib/capistrano/slnky/helpers.rb

@@ -0,0 +1,56 @@
+require 'erb'
+
+module Capistrano
+  module Slnky
+    module Helpers
+      # stolen from:
+      # https://github.com/capistrano-plugins/capistrano-unicorn-nginx/blob/e2e0dc17766ce6312a27eb5af52d521d9f6fb8ca/lib/capistrano/unicorn_nginx/helpers.rb
+      #
+      # renders the ERB template specified by template_name to string. Use the locals variable to pass locals to the
+      # ERB template
+      def template_to_s(template_name, locals = {})
+        config_file = "#{fetch(:templates_path)}/#{template_name}"
+        # if no customized file, proceed with default
+        unless File.exists?(config_file)
+          config_file = File.join(File.dirname(__FILE__), "templates/#{template_name}")
+        end
+
+        ERB.new(File.read(config_file), nil, '-').result(ERBNamespace.new(locals).get_binding)
+      end
+
+      # renders the ERB template specified by template_name to a StringIO buffer
+      def template(template_name, locals = {})
+        StringIO.new(template_to_s(template_name, locals))
+      end
+
+      def file_exists?(path)
+        test "[ -e #{path} ]"
+      end
+
+      def deploy_user
+        capture :id, '-un'
+      end
+
+      def sudo_upload!(from, to)
+        filename = File.basename(to)
+        to_dir = File.dirname(to)
+        tmp_file = "#{fetch(:tmp_dir)}/#{filename}"
+        upload! from, tmp_file
+        sudo :mv, tmp_file, to_dir
+      end
+
+      # Helper class to pass local variables to an ERB template
+      class ERBNamespace
+        def initialize(hash)
+          hash.each do |key, value|
+            singleton_class.send(:define_method, key) { value }
+          end
+        end
+
+        def get_binding
+          binding
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+start on started networking
+respawn
+
+env SLNKY_SERVICE="<%= fetch(:application) %>"
+export SLNKY_SERVICE
+env SLNKY_DIR="<%= current_path %>"
+export SLNKY_DIR
+env SLNKY_RVM="<%= fetch(:rvm_ruby_version) %>"
+export SLNKY_RVM
+env SLNKY_SCRIPT="service-<%= fetch(:slnky_service) %>"
+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

data/lib/capistrano/tasks/slnky.rake

@@ -1,3 +1,7 @@
+require 'capistrano/slnky/helpers'
+
+include Capistrano::Slnky::Helpers
+
 namespace :load do
   task :defaults do
     set :slnky_service, -> { "#{fetch(:application)}_#{fetch(:stage)}" }
@@ -7,12 +11,10 @@ namespace :load do
 end
 
 namespace :slnky do
-  desc 'upload local upstart config from upstart/init.conf'
-  task :config do
+  desc 'upload upstart config'
+  task :upstart do
     on roles :app do
-      service = fetch(:slnky_service)
-      upload! "upstart/init.conf", "/tmp/#{service}.conf"
-      sudo 'mv', "/tmp/#{service}.conf", "/etc/init/#{service}.conf"
+      sudo_upload! template('upstart.conf.erb'), "/etc/init/#{fetch(:slnky_service)}.conf"
     end
   end
 
@@ -28,7 +30,7 @@ end
 
 desc 'setup task'
 task :setup do
-  invoke 'slnky:config'
+  invoke 'slnky:upstart'
 end
 
 namespace :deploy do

data/lib/slnky/service.rb

@@ -7,8 +7,9 @@ require 'json'
 module Slnky
   module Service
     class Base
-      def initialize(url)
+      def initialize(url, env='development')
         @server = url
+        @environment = env
         @name = self.class.name.split('::').last.downcase
         json = open("#{@server}/configs/#{@name}") {|f| f.read }
         @config = JSON.parse(json)

data/lib/slnky/version.rb

@@ -1,3 +1,3 @@
 module Slnky
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slnky
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Shawn Catanzarite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,6 +140,8 @@ files:
 - Rakefile
 - bin/slnky
 - lib/capistrano/slnky.rb
+- lib/capistrano/slnky/helpers.rb
+- lib/capistrano/slnky/templates/upstart.conf.erb
 - lib/capistrano/tasks/slnky.rake
 - lib/slnky.rb
 - lib/slnky/cli.rb
@@ -164,10 +166,9 @@ files:
 - 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/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/upstart/init.conf.erb
 - lib/slnky/version.rb
 - slnky.gemspec
 homepage: https://github.com/shawncatz/slnky

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

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