conjure 0.2.4 → 0.2.5

data/History.md

@@ -1,3 +1,8 @@
+### Version 0.2.5
+2014-9-3
+
+* Extra configuration options for provisioning
+
 ### Version 0.2.4
 2014-8-29
 

data/lib/conjure/provision/instance.rb

@@ -6,9 +6,10 @@ require "yaml"
 module Conjure
   module Provision
     class Instance
-      def initialize(app_name, rails_env)
+      def initialize(app_name, rails_env, options = {})
         @app_name = app_name
         @rails_env = rails_env
+        @options = options
       end
 
       def provision(options = {})
@@ -21,7 +22,7 @@ module Conjure
         database = Postgres.new(platform)
         database.start
 
-        webserver = Passenger.new(platform, database, @rails_env)
+        webserver = Passenger.new(platform, database, @rails_env, @options)
         webserver.start
         passenger_ip = webserver.ip_address
 

data/lib/conjure/provision/passenger.rb

@@ -6,10 +6,12 @@ module Conjure
     class Passenger
       attr_reader :ip_address
 
-      def initialize(platform, database, rails_env)
+      def initialize(platform, database, rails_env, options)
         @platform = platform
         @database = database
         @rails_env = rails_env
+        @nginx_directives = options[:nginx_directives] || {}
+        @system_packages = options[:system_packages] || []
       end
 
       def start 
@@ -26,6 +28,7 @@ module Conjure
         public_key = File.expand_path("~/.ssh/id_rsa.pub")
         raise "Error: ~/.ssh/id_rsa.pub must exist." unless File.exist?(public_key)
         file = Docker::Template.new("conjure/passenger-ruby21:1.0.1")
+        file.run apt_command if apt_command
         file.add_file public_key, "/root/.ssh/authorized_keys"
         file.add_file public_key, "/home/app/.ssh/authorized_keys"
         file.run "chown app.app /home/app/.ssh/authorized_keys"
@@ -36,6 +39,12 @@ module Conjure
         file
       end
 
+      def apt_command
+        if @system_packages.any?
+          "apt-get update && apt-get install -y #{@system_packages.join ' '}"
+        end
+      end
+
       def database_yml
         {@rails_env => @database.rails_config}.to_yaml
       end
@@ -52,8 +61,8 @@ module Conjure
           :passenger_user => "app",
           :passenger_ruby => "/usr/bin/ruby2.1",
           :passenger_app_env => @rails_env,
-        }
-        "server {" + options.map{|k, v| "  #{k} #{v};"}.join("\n") + "}\n"
+        }.merge @nginx_directives
+        "server {\n" + options.map{|k, v| "  #{k} #{v};"}.join("\n") + "\n}\n"
       end
     end
   end

data/lib/conjure/version.rb

@@ -1,3 +1,3 @@
 module Conjure
-  VERSION = "0.2.4" unless defined?(VERSION)
+  VERSION = "0.2.5" unless defined?(VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjure
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog