vx-router 0.2.0.pre33 → 0.2.0.pre34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9e463fdffc6c9a508a0f2b1d0dd4c341847c4fb
-  data.tar.gz: d8e6e5eeeeab1609d78044000de21fd2eba0e659
+  metadata.gz: d1316b98281834134b4d7cca17414bba760be166
+  data.tar.gz: 0fbc8cf188d4ba900f7d0146ef27492febcda32c
 SHA512:
-  metadata.gz: 59ba74e907d16c705b551f78cea0540e919fe7145578680454e5124c293e0e6898899b3b125f8e5de7a520e5b3b60c8114e0c2c0c3bcb9d29e61d453cbc6d49f
-  data.tar.gz: d73cdfa94c44f3745ab4206dec1dded2b03025aab30c5f0cace6f70788561379ed3d4e0315f882818be2fc70421d91c8659961570b8c7d8f2779e7fed7b74653
+  metadata.gz: 6438331191c7842f3e76d3c284fe4b9ba58c1e1fe5ecad3699dae691c9872f1fbbbf1ff5a39e3f4171124abf6bdebf821756da25e31a3680e950ccd30a5f6799
+  data.tar.gz: f5dfaea461cb9d8ea6f51b35c13b47601cdf3debbdbfa299fa753125bb1b6ac69239120680db8c84f18709aa64083d43059a431f9ebee485036b0dd6c2cccc85

data/lib/vx/router/script_builder.rb

@@ -11,14 +11,15 @@ module Vx
       autoload :Prepare,      File.expand_path("../script_builder/prepare",       __FILE__)
       autoload :Databases,    File.expand_path("../script_builder/databases",     __FILE__)
       autoload :WebdavCache,  File.expand_path("../script_builder/webdav_cache",  __FILE__)
+      autoload :Services,     File.expand_path("../script_builder/services",      __FILE__)
 
       include Common::Helper::Middlewares
 
       middlewares do
         use ScriptBuilder::WebdavCache
+        use ScriptBuilder::Services
         use ScriptBuilder::Env
         use ScriptBuilder::Prepare
-        use ScriptBuilder::Databases
         use ScriptBuilder::Ruby
         use ScriptBuilder::Script
       end

data/lib/vx/router/script_builder/ruby.rb

@@ -4,10 +4,6 @@ module Vx
 
       Ruby = Struct.new(:app) do
 
-        ALIASES = {
-          '1.8.7' => "system"
-        }
-
         include Helper::TraceShCommand
 
         def call(env)
@@ -43,12 +39,7 @@ module Vx
           end
 
           def make_rbenv_version_command(env)
-            select_rbenv_version_by_aliases(env) ||
-              select_rbenv_version(env)
-          end
-
-          def select_rbenv_version_by_aliases(env)
-            ALIASES[rvm(env)]
+            select_rbenv_version(env)
           end
 
           def select_rbenv_version(env)

data/lib/vx/router/script_builder/services.rb

@@ -0,0 +1,22 @@
+module Vx
+  class Router
+    class ScriptBuilder
+
+      Services = Struct.new(:app) do
+
+        include Helper::TraceShCommand
+
+        def call(env)
+          env.configuration.services.each do |srv|
+            env.init << trace_sh_command("sudo service #{srv} start")
+          end
+          unless env.configuration.services.empty?
+            env.init << trace_sh_command("sleep 3")
+          end
+          app.call(env)
+        end
+
+      end
+    end
+  end
+end

data/lib/vx/router/version.rb

@@ -1,5 +1,5 @@
 module Vx
   class Router
-    VERSION = "0.2.0.pre33"
+    VERSION = "0.2.0.pre34"
   end
 end

data/spec/lib/script_builder/services_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Vx::Router::ScriptBuilder::Services do
+  let(:app)    { ->(_) { 0 } }
+  let(:config) { create :configuration, attributes: { services: "service" } }
+  let(:env)    { OpenStruct.new configuration: config, init: [] }
+  let(:mid)    { described_class.new app }
+
+  subject { mid.call env }
+
+  it { should eq 0 }
+
+  it "should start services in init section" do
+    subject
+    expected = [
+      "echo \\$\\ sudo\\ service\\ service\\ start\nsudo service service start",
+      "echo \\$\\ sleep\\ 3\nsleep 3"
+    ]
+    expect(env.init).to eq expected
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-router
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre33
+  version: 0.2.0.pre34
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vx-common
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre33
+        version: 0.2.0.pre34
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre33
+        version: 0.2.0.pre34
 - !ruby/object:Gem::Dependency
   name: vx-message
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre33
+        version: 0.2.0.pre34
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre33
+        version: 0.2.0.pre34
 - !ruby/object:Gem::Dependency
   name: vx-build_configuration
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre33
+        version: 0.2.0.pre34
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre33
+        version: 0.2.0.pre34
 - !ruby/object:Gem::Dependency
   name: vx-common-amqp
   requirement: !ruby/object:Gem::Requirement
@@ -168,17 +168,18 @@ files:
 - lib/vx/router/helper/trace_sh_command.rb
 - lib/vx/router/initializers/amqp.rb
 - lib/vx/router/script_builder.rb
-- lib/vx/router/script_builder/databases.rb
 - lib/vx/router/script_builder/env.rb
 - lib/vx/router/script_builder/prepare.rb
 - lib/vx/router/script_builder/ruby.rb
 - lib/vx/router/script_builder/script.rb
+- lib/vx/router/script_builder/services.rb
 - lib/vx/router/script_builder/webdav_cache.rb
 - lib/vx/router/version.rb
 - spec/lib/build_spec.rb
 - spec/lib/configuration_spec.rb
 - spec/lib/router_spec.rb
 - spec/lib/script_builder/prepare_spec.rb
+- spec/lib/script_builder/services_spec.rb
 - spec/lib/script_builder/webdav_cache_spec.rb
 - spec/lib/script_builder_spec.rb
 - spec/spec_helper.rb
@@ -207,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: ci router
@@ -216,6 +217,7 @@ test_files:
 - spec/lib/configuration_spec.rb
 - spec/lib/router_spec.rb
 - spec/lib/script_builder/prepare_spec.rb
+- spec/lib/script_builder/services_spec.rb
 - spec/lib/script_builder/webdav_cache_spec.rb
 - spec/lib/script_builder_spec.rb
 - spec/spec_helper.rb

data/lib/vx/router/script_builder/databases.rb

@@ -1,28 +0,0 @@
-module Vx
-  class Router
-    class ScriptBuilder
-
-      Databases = Struct.new(:app) do
-
-        def call(env)
-          psql = []
-          psql << %{sudo -u postgres psql -q -h localhost -c "create role ci with login superuser password 'ci'" || true}
-          psql << %{sudo -u postgres psql -q -h localhost -c "create database ci" || true}
-
-          mysql = []
-
-          mysql << %{echo "CREATE USER 'ci'@'localhost';" | mysql -u root }
-          mysql << %{echo "GRANT ALL PRIVILEGES ON *.* TO 'ci'@'localhost';" | mysql -u root }
-
-          env.init.tap do |i|
-            psql.each {|c| i << c }
-            mysql.each {|c| i << c }
-          end
-
-          app.call(env)
-        end
-
-      end
-    end
-  end
-end