cany 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8ffadee6ad8d67a8875afc014992492b3e55119
-  data.tar.gz: c109aa1b6c99f0075b68e5e182f90ad992401161
+  metadata.gz: 8b17f53a807349e5ba0daab0b18ed9aaebf0998b
+  data.tar.gz: ea9b74995db2691b0a783192f8c408ce12dd4dd5
 SHA512:
-  metadata.gz: 7b6df83b694ce69713bba4e04542964fd5f3502f890a01a4a804d607cceee51ae1e3d0a658e46d198d09fb3a08e13913b67ce9b146d7f9864e52bc9d1c4849ed
-  data.tar.gz: 6975b1e62035ae0e644f1caab4216e864076fc5d666f080d7ca9fcbb118caff00cafa2b397b95861fedfab82c48800822b2183fb93041e93116a4465d9705f1e
+  metadata.gz: 5d0cd4134c0e0a841019f9509202a140a7231fc2ccfe46aad6bdf108240787c930fd98ab5584a20080b8f898338d04256c126728da854b4fb1b0a2af65d21658
+  data.tar.gz: 2ac9ce3592f29db17c162a902a70ed27da9cc0d92874f985ac00f1765ce200c0f6b467e5174f107aafccccdb041e25c07118ce8f84ce6a6cc05fd04cd84c791d

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+0.2.0 / 2013-09-25
+==================
+
+Feature:
+
+  * sidekiq: option to specify as which user and group sidekiq should run
+  * web server: option to specify as which user and group the web server should run (thin, unicorn)
+
+
 0.1.3 / 2013-09-25
 ==================
 
@@ -10,7 +19,7 @@ Bug Fixes:
 ==================
 
 Bug Fixes:
-  
+
   * dpkg: fix build error with --no-arch-all
   * recipe: fix web server pre start scripts
 

data/lib/cany/recipes/sidekiq.rb

@@ -3,15 +3,28 @@ module Cany::Recipes
   #   "Simple, efficient, background processing in Ruby"
   # Sidekiq is registered as service and so automatically started.
   # @see http://sidekiq.org/ The official website for more information.
-  # @node The recipe relies that 'sidekiq' is listed inside your Gemfile and
+  # @note The recipe relies that 'sidekiq' is listed inside your Gemfile and
   #   therefore installed via the 'bundler' recipe.
+  #
+  # @!attribute queues
+  #   @return [Array<String>, nil] An (optional) list of queue names sidekiq
+  #     should listen on
+  # @!attribute user
+  #   @return [String, nil] The user name as which the sidekiq process should
+  #      executed
+  # @!attribute group
+  #   @return [String, nil] The group name as which the sidekiq process should
+  #      executed
   class Sidekiq < Cany::Recipe
     register_as :sidekiq
 
     attr_accessor :queues
+    attr_accessor :user, :group
 
     def initialize(*args)
       @queues = []
+      @user = 'www-data'
+      @group = 'www-data'
       super
     end
 
@@ -19,10 +32,11 @@ module Cany::Recipes
       def queue(name)
         @recipe.queues << name
       end
+      delegate :user, :group
     end
 
     def binary
-      install_service name, %W(/usr/bin/#{spec.name} sidekiq) + sidekiq_args, user: 'www-data', group: 'www-data'
+      install_service name, %W(/usr/bin/#{spec.name} sidekiq) + sidekiq_args, user: user, group: group
       inner.binary
     end
 

data/lib/cany/recipes/thin.rb

@@ -15,7 +15,7 @@ module Cany::Recipes
     register_as :thin
 
     def launch_command
-      %W(thin start -C /etc/#{spec.name}/thin.yml")
+      %W(thin start --config /etc/#{spec.name}/thin.yml)
     end
 
     def binary

data/lib/cany/recipes/web_server.rb

@@ -1,14 +1,29 @@
-module Cany
-  module Recipes
-    class WebServer < Recipe
-      def binary
-        recipe(:system).configure :service_pre_scripts, {
-          mkdir_run: "mkdir -p /var/run/#{spec.name}",
-          chown_run: "chown www-data /var/run/#{spec.name}"
-        }
-        install_service name, ["/usr/bin/#{spec.name}"] + launch_command, user: 'www-data', group: 'www-data'
-        inner.binary
-      end
+module Cany::Recipes
+  # @!attribute user
+  #   @return [String, nil] The user name as which the web server process should
+  #      executed
+  # @!attribute group
+  #   @return [String, nil] The group name as which the web server process should
+  #      executed
+  class WebServer < Cany::Recipe
+    attr_accessor :user, :group
+    class DSL < Cany::Recipe::DSL
+      delegate :user, :group
+    end
+
+    def initialize(*args)
+      @user = 'www-data'
+      @group = 'www-data'
+      super
+    end
+
+    def binary
+      recipe(:system).configure :service_pre_scripts, {
+        mkdir_run: "mkdir -p /var/run/#{spec.name}",
+        chown_run: "chown #{user}:#{group} /var/run/#{spec.name}"
+      }
+      install_service name, ["/usr/bin/#{spec.name}"] + launch_command, user: user, group: group
+      inner.binary
     end
   end
 end

data/lib/cany/version.rb

@@ -1,8 +1,8 @@
 module Cany
   module VERSION
     MAJOR = 0
-    MINOR = 1
-    PATCH = 3
+    MINOR = 2
+    PATCH = 0
     STAGE = nil
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')
     def self.to_s; STRING end

data/spec/cany/recipes/sidekiq_spec.rb

@@ -28,6 +28,7 @@ describe Cany::Recipes::Sidekiq do
       end
     end
   end
+
   context 'with queue names' do
     before do
       spec.setup do
@@ -49,4 +50,26 @@ describe Cany::Recipes::Sidekiq do
       recipe.binary
     end
   end
+
+  context 'with defined user/group' do
+    before do
+      spec.setup do
+        use :sidekiq do
+          user 'user'
+          group 'group'
+        end
+      end
+    end
+
+    it 'should launch sidekiq with as this user and group' do
+      expect(recipe).to receive(:install_service).with(
+                            :sidekiq,
+                            %w(/usr/bin/test sidekiq --environment production),
+                            user: 'user', group: 'group'
+                        )
+      recipe.inner = double('recipe')
+      expect(recipe.inner).to receive(:binary)
+      recipe.binary
+    end
+  end
 end

data/spec/cany/recipes/thin_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe Cany::Recipes::Thin do
+  let(:setup) { proc { use :thin } }
+  let(:spec) do
+    Cany::Specification.new do
+      name 'test'
+    end
+  end
+  let(:recipe) { spec.recipes.first }
+  let(:system_recipe) { Cany::Dpkg::DebHelperRecipe.new(spec) }
+  let(:pre_scripts) { system_recipe.option(:service_pre_scripts) }
+  subject { recipe.binary }
+
+  context '#binary' do
+    before do
+      spec.setup &setup
+      spec.system_recipe = system_recipe
+      recipe.inner = double('recipe')
+      expect(recipe.inner).to receive(:binary)
+    end
+
+    context 'without configuration' do
+      it 'should launch unicorn only with environment specification and config file' do
+        expect(recipe).to receive(:install_service).with(
+                              :thin,
+                              %w(/usr/bin/test thin start --config /etc/test/thin.yml),
+                              user: 'www-data', group: 'www-data'
+                          )
+        expect(recipe).to receive(:install_content).with '/etc/test/thin.yml', <<CONFIG
+---
+environment: production
+socket: /var/run/test/sock
+pid: /var/run/test/thin.pid
+CONFIG
+        subject
+        expect(pre_scripts).to eq({
+                                      mkdir_run: 'mkdir -p /var/run/test',
+                                      chown_run: 'chown www-data:www-data /var/run/test'
+                                  })
+      end
+    end
+
+    context 'with defined user/group' do
+      let(:setup) { proc { use(:thin) { user 'user'; group 'group' } } }
+
+      it 'should launch unicorn with as this user and group' do
+        expect(recipe).to receive(:install_service).with(
+                              :thin,
+                              %w(/usr/bin/test thin start --config /etc/test/thin.yml),
+                              user: 'user', group: 'group'
+                          )
+        subject
+        expect(pre_scripts).to eq({
+                                      mkdir_run: 'mkdir -p /var/run/test',
+                                      chown_run: 'chown user:group /var/run/test'
+                                  })
+      end
+    end
+  end
+end

data/spec/cany/recipes/unicorn_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe Cany::Recipes::Unicorn do
+  let(:setup) { proc { use :unicorn } }
+  let(:spec) do
+    Cany::Specification.new do
+      name 'test'
+    end
+  end
+  let(:recipe) { spec.recipes.first }
+  let(:system_recipe) { Cany::Dpkg::DebHelperRecipe.new(spec) }
+  let(:pre_scripts) { system_recipe.option(:service_pre_scripts) }
+  subject { recipe.binary }
+
+  context '#binary' do
+    before do
+      spec.setup &setup
+      spec.system_recipe = system_recipe
+      recipe.inner = double('recipe')
+      expect(recipe.inner).to receive(:binary)
+    end
+
+    context 'without configuration' do
+
+      it 'should launch unicorn only with environment specification and config file' do
+        expect(recipe).to receive(:install_service).with(
+                              :unicorn,
+                              %w(/usr/bin/test unicorn --config-file /etc/test/unicorn.rb --env production),
+                              user: 'www-data', group: 'www-data'
+                          )
+        subject
+        expect(pre_scripts).to eq({
+                                      mkdir_run: 'mkdir -p /var/run/test',
+                                      chown_run: 'chown www-data:www-data /var/run/test'
+                                  })
+      end
+    end
+
+    context 'with defined user/group' do
+      let(:setup) { proc { use(:unicorn) { user 'user'; group 'group' } } }
+
+      it 'should launch unicorn with as this user and group' do
+        expect(recipe).to receive(:install_service).with(
+                              :unicorn,
+                              %w(/usr/bin/test unicorn --config-file /etc/test/unicorn.rb --env production),
+                              user: 'user', group: 'group'
+                          )
+        subject
+        expect(pre_scripts).to eq({
+                                      mkdir_run: 'mkdir -p /var/run/test',
+                                      chown_run: 'chown user:group /var/run/test'
+                                  })
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cany
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Malte Swart
@@ -99,6 +99,8 @@ files:
 - spec/cany/recipes/bundler_spec.rb
 - spec/cany/recipes/rails_spec.rb
 - spec/cany/recipes/sidekiq_spec.rb
+- spec/cany/recipes/thin_spec.rb
+- spec/cany/recipes/unicorn_spec.rb
 - spec/cany/specification_spec.rb
 - spec/cany_spec.rb
 - spec/fixtures/multiple/one.canspec
@@ -141,6 +143,8 @@ test_files:
 - spec/cany/recipes/bundler_spec.rb
 - spec/cany/recipes/rails_spec.rb
 - spec/cany/recipes/sidekiq_spec.rb
+- spec/cany/recipes/thin_spec.rb
+- spec/cany/recipes/unicorn_spec.rb
 - spec/cany/specification_spec.rb
 - spec/cany_spec.rb
 - spec/fixtures/multiple/one.canspec