conjure 0.1.8 → 0.2.0

data/History.md

@@ -1,3 +1,9 @@
+### Version 0.2.0
+2014-3-18
+
+* Add source files for published Docker images
+* Experimental API for programmatic provisioning
+
 ### Version 0.1.8
 2014-1-24
 

data/README.md

@@ -2,6 +2,8 @@
 [![Gem Version](https://badge.fury.io/rb/conjure.png)](http://badge.fury.io/rb/conjure)
 [![Build Status](https://travis-ci.org/brianauton/conjure.png?branch=master)](https://travis-ci.org/brianauton/conjure)
 [![Code Climate](https://codeclimate.com/github/brianauton/conjure.png)](https://codeclimate.com/github/brianauton/conjure)
+[![Dependency Status](https://gemnasium.com/brianauton/conjure.png)](https://gemnasium.com/brianauton/conjure)
+
 
 Magically powerful deployment for Rails applications.
 

data/lib/conjure/application.rb

@@ -7,11 +7,11 @@ module Conjure
     end
 
     def instances
-      Instance.where(:application => self)
+      Instance.where(:origin => @origin)
     end
 
     def data_sets
-      DataSet.find(:application => self)
+      DataSet.find(:origin => @origin)
     end
 
     def name

data/lib/conjure/command.rb

@@ -8,29 +8,37 @@ module Conjure
       Log.level = :debug if options[:verbose]
     end
 
+    desc "create", "Create and deploy a new instance of the application"
+    method_option :branch, :aliases => "-b", :type => :string, :desc => "Specify branch to deploy, default 'master'"
+    method_option :origin, :type => :string, :desc => "Specify git URL to deploy from"
+    method_option :rails_env, :type => :string, :desc => "Specify the Rails environment, default 'production'"
+    def create
+      target.new_instance.create
+    end
+
     desc "deploy", "Deploy the app"
-    method_option :branch, :aliases => "-b", :type => :string, :desc => "Specify branch to deploy"
-    method_option :test, :type => :boolean, :desc => "Describe the deploy settings but don't deploy"
+    method_option :branch, :aliases => "-b", :type => :string, :desc => "Specify branch to deploy, default 'master'"
     method_option :origin, :type => :string, :desc => "Specify git URL to deploy from"
+    method_option :rails_env, :type => :string, :desc => "Specify the Rails environment, default 'production'"
     def deploy
-      deployment.deploy
+      (target.existing_instance || target.new_instance).deploy
     end
 
     desc "import FILE", "Import the production database from a postgres SQL dump"
     def import(file)
-      deployment.database.import file
+      target.existing_instance.database.import file
     end
 
     desc "export FILE", "Export the production database to a postgres SQL dump"
     def export(file)
-      deployment.database.export file
+      target.existing_instance.database.export file
     end
 
     desc "log", "Display the Rails log from the deployed application"
     method_option :num, :aliases => "-n", :type => :numeric, :default => 10, :desc => "Show N lines of output"
     method_option :tail, :aliases => "-t", :type => :boolean, :desc => "Continue streaming new log entries"
     def log
-      Service::RailsLogView.new(:shell => deployment.shell, :lines => options[:num], :tail => options[:tail]) do |stdout|
+      Service::RailsLogView.new(:shell => target.existing_instance.shell, :rails_env => target.existing_instance.rails_env, :lines => options[:num], :tail => options[:tail]) do |stdout|
         print stdout
       end
     end
@@ -38,42 +46,29 @@ module Conjure
     desc "rake [ARGUMENTS...]", "Run the specified rake task on the deployed application"
     def rake(*arguments)
       task = arguments.join(" ")
-      Service::RakeTask.new(:task => task, :shell => deployment.shell) do |stdout|
+      Service::RakeTask.new(:task => task, :shell => target.existing_instance.shell) do |stdout|
         print stdout
       end
     end
 
     desc "console", "Start a console on the deployed application"
     def console
-      Service::RailsConsole.new(:shell => deployment.shell) do |stdout|
+      Service::RailsConsole.new(:shell => target.existing_instance.shell) do |stdout|
         print stdout
       end
     end
 
     desc "show", "Show info on deployed instances"
     def show
-      puts View::ApplicationView.new(application).render
+      puts View::ApplicationView.new(target.application).render
     end
 
     default_task :help
 
     private
 
-    def application
-      @application ||= Application.find(:path => Dir.pwd, :origin => options[:origin])
-    end
-
-    def deployment
-      @deployment ||= Service::RailsDeployment.new({
-        :branch => options[:branch],
-        :origin => application.origin,
-        :target => target,
-        :test => options[:test],
-      })
-    end
-
     def target
-      Target.new(:machine_name => "#{application.name}-production")
+      CommandTarget.new(options)
     end
   end
 end

data/lib/conjure/command_target.rb

@@ -0,0 +1,25 @@
+module Conjure
+  class CommandTarget
+    def initialize(options = {})
+      @origin = options[:origin]
+      @branch = options[:branch] || "master"
+      @rails_env = options[:rails_env] || "production"
+    end
+
+    def application
+      @application ||= Application.find(:path => Dir.pwd, :origin => @origin)
+    end
+
+    def existing_instance
+      @existing_instance ||= application.instances.first
+    end
+
+    def new_instance
+      @new_instance ||= Instance.new(
+        :origin => application.origin,
+        :branch => @branch,
+        :rails_environment => @rails_env,
+      )
+    end
+  end
+end

data/lib/conjure/instance.rb

@@ -1,39 +1,100 @@
 module Conjure
   class Instance
-    attr_reader :application, :ip_address, :rails_environment
-
     def initialize(options)
-      @application = options[:application]
-      @ip_address = options[:ip_address]
+      @origin = options[:origin]
+      @branch = options[:branch]
       @rails_environment = options[:rails_environment]
+      @server = options[:server]
     end
 
     def self.where(options = {})
       Collection.new(options)
     end
 
+    def origin
+      @origin ||= @server.name.split("-")[0]
+    end
+
+    def rails_environment
+      @rails_environment ||= @server.name.split("-")[1]
+    end
+
+    def ip_address
+      @server.ip_address
+    end
+
+    def shell
+      rails_server.base_image
+    end
+
+    def branch
+      @branch ||= codebase.branch
+    end
+
+    def database
+      codebase.database
+    end
+
+    def create
+      @server_name = Service::CloudServer.ensure_unique_name(server_name)
+      deploy
+    end
+
+    def deploy
+      Log.info "[deploy] Deploying #{branch} to #{rails_environment}"
+      codebase.install
+      rails_server.run
+      Log.info "[deploy] Application deployed to #{ip_address}"
+    end
+
+    def codebase
+      @codebase ||= Service::RailsCodebase.new target, origin, @branch, rails_environment
+    end
+
+    def rails_server
+      @rails_server ||= Service::RailsServer.new target, rails_environment
+    end
+
+    def server_name
+      @server_name ||= "#{application_name}-#{rails_environment}"
+    end
+
+    def server
+      @server ||= Service::CloudServer.new(server_name)
+    end
+
+    def target
+      @target ||= Target.new(:machine_name => server.name)
+    end
+
+    def application_name
+      Application.new(:origin => @origin).name
+    end
+
     def status
       "running"
     end
 
+    def name
+      server.name
+    end
+
     class Collection
       include Enumerable
 
       def initialize(options)
-        @application = options[:application]
+        @origin = options[:origin]
       end
 
-      def server
-        @server ||= Service::CloudServer.new("#{@application.name}-production") if @application
+      def application_name
+        Application.new(:origin => @origin).name
       end
 
       def each(&block)
-        if server and server.existing_server
-          yield Instance.new(
-            :application => @application,
-            :rails_environment => "production",
-            :ip_address => server.ip_address
-          )
+        return unless @origin
+        Service::CloudServer.each_with_name_prefix("#{application_name}-") do |server|
+          match = server.name.match(/^#{application_name}-([^-]+)(-[0-9]+)?$/)
+          yield Instance.new(:server => server) if match
         end
       end
     end

data/lib/conjure/notes.txt

@@ -1,9 +1,61 @@
+==== New hook-based architecture:
+  1. Proxy app, binds to machine's ports and proxies traffic to other containers
+  2. Deployer app, builds and starts revisions of the app in other containers
+    - Recieves github push notification, builds a new container with the new app revision
+    - Uses a custom-built Dockerfile for the app, designed to rebuild with minimal i/o
+    - After new revision is verified up and running, notifies the proxy to redirect
+    - Could run a small capybara smoke test against the production app
+    - Stops old container. Destroys it? (Rebuilding it should be fast if needed)
+  3. The application itself
+====
+
+1. Add area in conjure repo to build and publish docker images
+  - publish "conjure/passenger-ruby21"
+  - publish "conjure/postgres"
+2. Add isolated conjure commands to work with custom docker images:
+  - "provision [rails-env]"
+    - Creates DO server using DIGITAL_OCEAN_* env vars
+    - Starts conjure/postgres
+    - Installs shared database.yml
+    - Adds 'passenger_app_env ENV' to http{} section of nginx.conf
+    - Starts conjure/passenger-ruby21 linked to postgres
+    - Displays needed Cap info: ip, ssh port, deploy user, app path, rails_env
+  - "addkey [ip] [sshport]"
+3. Add conjure to client app & run "provision staging"
+4. Add Cap to client app and configure staging settings
+5. "cap staging deploy" from client app
+
+==== Steps to deploy w/ Cap:
+
+Dockerfile (webserver):
+  Install passenger/nginx
+  Install likely gem dependencies incl. node
+  Install required ruby version
+Dockerfile (postgres):
+
+Conjure:
+  Provision DigitalOcean Docker instance
+
+  Postgres:
+    Start postgres container
+
+  Passenger:
+    Start webserver container linked to postgres container
+    Install public key in webserver container
+    Install nginx config for app
+    Install shared database.yml
+
+Script in app:
+Capistrano:
+  Deploy current app version
+
+
 TASKS:
   Remove "label" from prepared shell creation
     Alternate way to show per-service progress output
       Log creation and status from each service
       Log name and IP from docker container creation in verbose mode only
-  Separate resources vs services
+  Separate platforms vs services
   Deployment.deploy should become Deployment.create
 
 Instead of passing DockerHost objects around, pass something that
@@ -51,10 +103,10 @@ But where do the database, logger, cron jobs, and other required
 services get identified and instantiated?
 
 Conjure's basic job is: deploy [something] [somewhere] using
-[resources]. "Something" is a Service, of which Instance and DataSet
+[platforms]. "Something" is a Service, of which Instance and DataSet
 are both types. "Somewhere" is the desired interface over which the
-new Service will be accessible. "Resource" is the cloud service, local
-VMs, and other combined resources that will be used to do the
+new Service will be accessible. "Platform" is the cloud service, local
+VMs, and other combined platforms that will be used to do the
 deployment.
 
 Need a concept for something that has both stdin and stdout (and
@@ -93,7 +145,6 @@ supported), or rails_env. Need "deploy" to be a shorthand for either
 already a staging instance. Maybe "deploy" should be deprecated?
 
 Needs:
-  Route all current commands through instances
   Separate commands to "create" and "update" instances
   Support specific env/branch when creating
   Preserve existing env/branch when updating
@@ -104,4 +155,47 @@ Needs:
   Deploy to local docker
   Deploy to vagrant (?)
   Progress display
+  Allow specifying SHA for deployment (pull out into object with repo+branch?)
   Used stored docker images for faster deployment
+
+
+New Refactor (POODR)
+
+  Application-related models:
+    Application - All revisions of the app in abstract (a repo URL for now)
+    ApplicationVersion - Refers to a specific repo/branch/revision
+    ApplicationSource - Unpacked into a file system for reading/writing
+
+  UserPreferredPlatform - used by Command. Takes all user
+  configuration (command line switches, config file, etc) and produces
+  a Platform used to provision services.
+
+  InstanceFactory - takes a Platform and an ApplicationRevision to deploy on it.
+    queries [something] to ask which services the ApplicationRevision needs.
+    queries Instance to create it with the services
+  Instance - associates an ApplicationVersion with multiple Services that support it.
+    traverses the services to find certain kinds (web service, database)
+
+
+Acceptance specs that drive Command and watch for specific output
+Unit specs for Command that expect messages to collaborators
+
+
+[binary]
+  constructs Command with a CommandResultView
+
+Command
+  takes status_view (via constant)
+  sends output to status_view
+
+StatusView
+  takes various *View classes for rendering different types
+  takes output_stream
+  sends output_stream and object for each object rendered
+  sends text output directly to output_stream
+
+ApplicationView
+  takes output_stream and application
+
+Cloud server infrastructure tips:
+http://wblinks.com/notes/aws-tips-i-wish-id-known-before-i-started/

data/lib/conjure/provision.rb

@@ -0,0 +1 @@
+require "conjure/provision/instance"

data/lib/conjure/provision/docker_image.rb

@@ -0,0 +1,20 @@
+module Conjure
+  module Provision
+    class DockerImage
+      attr_reader :image_name
+
+      def initialize(server, base_image_name)
+        @server = server
+        @image_name = base_image_name
+      end
+
+      def start(shell_command, options = {})
+        container_id = @server.run("docker run -d #{options[:run_options].to_s} #{image_name} #{shell_command}").strip
+        sleep 2
+        ip_address = @server.run("docker inspect -format '{{ .NetworkSettings.IPAddress }}' #{container_id}").strip
+        raise "Container failed to start" unless ip_address.present?
+        ip_address
+      end
+    end
+  end
+end

data/lib/conjure/provision/dockerfile.rb

@@ -0,0 +1,62 @@
+require "conjure/provision/docker_image"
+
+module Conjure
+  module Provision
+    class Dockerfile
+      def initialize(base_image_name)
+        @commands = ["FROM #{base_image_name}"]
+        @file_data = {}
+      end
+
+      def add_file(filename, remote_name)
+        add_file_data File.read(filename), remote_name
+      end
+
+      def add_file_data(data, remote_name)
+        local_name = "file#{@file_data.length+1}"
+        @file_data[local_name] = data
+        @commands << "ADD #{local_name} #{remote_name}"
+      end
+
+      def run(command)
+        @commands << "RUN #{command}"
+      end
+
+      def source
+        @commands.join "\n"
+      end
+
+      def prepare_build_directory(&block)
+        Dir.mktmpdir do |dir|
+          @file_data.merge("Dockerfile" => source).each do |filename, data|
+            File.write "#{dir}/#{filename}", data
+          end
+          yield dir
+        end
+      end
+
+      def upload_build_directory(server, &block)
+        archive = "/tmp/dockerfile.tar.gz"
+        build_dir = "/tmp/docker_build"
+        prepare_build_directory do |dir|
+          `cd #{dir}; tar czf #{archive} *`
+          server.send_file archive, "dockerfile.tar.gz"
+          server.run "mkdir #{build_dir}; cd #{build_dir}; tar xzf ~/dockerfile.tar.gz"
+          result = yield "/tmp/docker_build"
+          server.run "rm -Rf #{build_dir} ~/dockerfile.tar.gz"
+          `rm #{archive}`
+          result
+        end
+      end
+
+      def build(server)
+        result = upload_build_directory(server) { |dir| server.run "docker build #{dir}" }
+        if match = result.match(/Successfully built ([0-9a-z]+)/)
+          DockerImage.new server, match[1]
+        else
+          raise "Failed to build Docker image, output was #{result}"
+        end
+      end
+    end
+  end
+end

data/lib/conjure/provision/instance.rb

@@ -0,0 +1,72 @@
+require "conjure/provision/dockerfile"
+
+module Conjure
+  module Provision
+    class Instance
+      def initialize(app_name, rails_env)
+        @app_name = app_name
+        @rails_env = rails_env
+      end
+
+      def provision
+        server = Server.create "#{@app_name}-#{@rails_env}"
+
+        db_password = new_db_password
+        postgres_image = postgres_dockerfile(db_password).build(server)
+        db_ip_address = postgres_image.start("/sbin/my_init")
+
+        passenger_image = passenger_dockerfile(db_ip_address, db_password).build(server)
+        passenger_image.start("/sbin/my_init", :run_options => "-p 80:80 -p 2222:22")
+
+        host = "root@#{server.ip_address} -p 2222"
+        remote_command host, "/etc/init.d/nginx restart"
+        {
+          :ip_address => server.ip_address,
+          :port => "2222",
+          :user => "app",
+          :rails_env => @rails_env
+        }
+      end
+
+      def postgres_dockerfile(db_password)
+        file = Dockerfile.new("conjure/postgres93:1.0.0")
+        file.run "echo \"ALTER USER db PASSWORD '#{db_password}'\" >/tmp/setpass"
+        file.run "/sbin/my_init -- /sbin/setuser postgres sh -c \"sleep 1; psql -f /tmp/setpass\""
+        file.run "rm /tmp/setpass"
+        file
+      end
+
+      def passenger_dockerfile(db_ip_address, db_password)
+        public_key = File.expand_path("~/.ssh/id_rsa.pub")
+        raise "Error: ~/.ssh/id_rsa.pub must exist." unless File.exist?(public_key)
+        file = Dockerfile.new("conjure/passenger-ruby21:1.0.0")
+        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"
+        file.run "chown root.root /root/.ssh/authorized_keys"
+        file.add_file_data application_conf, "/etc/nginx/sites-enabled/application.conf"
+        file.add_file_data database_yml(db_ip_address, db_password), "/home/app/application/shared/config/database.yml"
+        file
+      end
+
+      def new_db_password
+        require "securerandom"
+        SecureRandom.urlsafe_base64 20
+      end
+
+      def database_yml(db_ip_address, db_password)
+        require "yaml"
+        {@rails_env => {"adapter" => "sqlite3", "database" => "db/#{@rails_env}.sqlite3", "host" => db_ip_address, "username" => "db", "password" => db_password}}.to_yaml
+      end
+
+      def application_conf
+        options = {listen: "80", root: "/home/app/application/current/public", passenger_enabled: "on", passenger_user: "app", passenger_ruby: "/usr/bin/ruby2.1", passenger_app_env: @rails_env}
+        "server {" + options.map{|k, v| "  #{k} #{v};"}.join("\n") + "}\n"
+      end
+
+      def remote_command(host, command)
+        `ssh -o StrictHostKeyChecking=no #{host} #{command}`
+      end
+    end
+  end
+end

data/lib/conjure/provision/server.rb

@@ -0,0 +1,64 @@
+module Conjure
+  module Provision
+    class Server
+      def initialize(server)
+        @server = server
+        puts "Configuring droplet..."
+        install_swap
+      end
+
+      def ip_address
+        @server.public_ip_address
+      end
+
+      def run(command)
+        `ssh #{ssh_options} root@#{ip_address} '#{shell_escape_single_quotes command}'`
+      end
+
+      def send_file(local_name, remote_name)
+        `scp #{ssh_options} #{local_name} root@#{ip_address}:#{remote_name}`
+      end
+
+      def ssh_options
+        "-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
+      end
+
+      def shell_escape_single_quotes(command)
+        command.gsub("'", "'\"'\"'")
+      end
+
+      def install_swap
+        run "dd if=/dev/zero of=/root/swapfile bs=1024 count=524288"
+        run "mkswap /root/swapfile; swapon /root/swapfile"
+      end
+
+      def self.create(name)
+        puts "Creating DigitalOcean droplet..."
+        connection = Fog::Compute.new compute_options
+        new connection.servers.bootstrap(bootstrap_options name)
+      end
+
+      def self.compute_options
+        raise "Error: DIGITALOCEAN_API_KEY and DIGITALOCEAN_CLIENT_ID env vars must both be set." unless ENV["DIGITALOCEAN_API_KEY"] && ENV["DIGITALOCEAN_CLIENT_ID"]
+        {
+          :provider => :digitalocean,
+          :digitalocean_api_key => ENV["DIGITALOCEAN_API_KEY"],
+          :digitalocean_client_id => ENV["DIGITALOCEAN_CLIENT_ID"],
+        }
+      end
+
+      def self.bootstrap_options(name)
+        ssh_dir = File.expand_path("~/.ssh")
+        raise "Error: ~/.ssh/id_rsa and ~/.ssh/id_rsa.pub must exist." unless File.exist?(ssh_dir) && File.exist?("#{ssh_dir}/id_rsa") && File.exist?("#{ssh_dir}/id_rsa.pub")
+        {
+          :name => name,
+          :flavor_id =>  "66",
+          :region_id => "4",
+          :image_id => "2158507",
+          :private_key_path => "#{ssh_dir}/id_rsa",
+          :public_key_path => "#{ssh_dir}/id_rsa.pub",
+        }
+      end
+    end
+  end
+end

data/lib/conjure/service/cloud_server.rb

@@ -3,6 +3,7 @@ module Conjure
     class CloudServer
       require "fog"
       require "pathname"
+      attr_reader :name
 
       def initialize(name)
         @name = name
@@ -32,6 +33,30 @@ module Conjure
         @existing_server ||= connection.servers.find{|s| s.name == @name } if connection
       end
 
+      def self.connection
+        new("").connection
+      end
+
+      def self.each_with_name_prefix(prefix, &block)
+        return unless connection
+        connection.servers.all.select{|s| s.name.match(/^#{prefix}/)}.each do |server|
+          block.call new(server.name)
+        end
+      end
+
+      def self.ensure_unique_name(name)
+        return name unless connection
+        existing_names = connection.servers.all.map{ |s| s.name }
+        name = increment_numeric_suffix(name) while existing_names.include? name
+        name
+      end
+
+      def self.increment_numeric_suffix(name)
+        parts = name.split("-")
+        parts[2] = parts[2] ? ((parts[2].to_i)+1).to_s : "2"
+        parts.join("-")
+      end
+
       def new_server
         Log.info " [cloud] Launching new server #{@name}"
         bootstrap_options = account.bootstrap_options.merge(:name => @name)

data/lib/conjure/service/rails_codebase.rb

@@ -21,6 +21,10 @@ module Conjure
         }.to_yaml
       end
 
+      def branch
+        @branch ||= repository_link.branch
+      end
+
       def install
         repository_link.update
         configure_database

data/lib/conjure/service/rails_log_view.rb

@@ -5,7 +5,7 @@ module Conjure
         arguments = []
         arguments << "-n #{options[:lines]}" if options[:lines]
         arguments << "-f" if options[:tail]
-        arguments << "application_root/log/production.log"
+        arguments << "application_root/log/#{options[:rails_env]}.log"
         options[:shell].command("tail #{arguments.join ' '}", &block)
       rescue Interrupt
       end

data/lib/conjure/service/repository_link.rb

@@ -12,6 +12,10 @@ module Conjure
         code_checked_out ? fetch_code_updates : checkout_code
       end
 
+      def branch
+        @branch ||= git_shell.command("cd #{code_path}; git rev-parse --abbrev-ref HEAD").strip
+      end
+
       private
 
       def code_checked_out

data/lib/conjure/version.rb

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

data/lib/conjure/view/application_view.rb

@@ -30,9 +30,9 @@ module Conjure
       def instances_table
         data = @instances.map do |instance|
           {
-            "Address" => instance.ip_address,
-            "Environment" => instance.rails_environment,
+            "Name" => instance.name,
             "Status" => instance.status,
+            "Address" => instance.ip_address,
           }
         end
         TableView.new(data).render

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: conjure
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Brian Auton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: unf
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -69,20 +78,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: 3.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: 3.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -102,64 +115,70 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- History.md
-- License.txt
-- README.md
-- bin/conjure
 - lib/conjure.rb
+- lib/conjure/instance.rb
+- lib/conjure/target.rb
+- lib/conjure/provider.rb
 - lib/conjure/application.rb
-- lib/conjure/command.rb
+- lib/conjure/command_target.rb
+- lib/conjure/log.rb
+- lib/conjure/version.rb
 - lib/conjure/config.rb
-- lib/conjure/data_set.rb
 - lib/conjure/identity.rb
-- lib/conjure/instance.rb
-- lib/conjure/log.rb
-- lib/conjure/notes.txt
-- lib/conjure/provider.rb
-- lib/conjure/service/cloud_server.rb
-- lib/conjure/service/database.rb
-- lib/conjure/service/database/mysql.rb
-- lib/conjure/service/database/postgres.rb
+- lib/conjure/provision/server.rb
+- lib/conjure/provision/instance.rb
+- lib/conjure/provision/docker_image.rb
+- lib/conjure/provision/dockerfile.rb
+- lib/conjure/command.rb
+- lib/conjure/data_set.rb
 - lib/conjure/service/digital_ocean_account.rb
-- lib/conjure/service/docker_host.rb
-- lib/conjure/service/docker_shell.rb
-- lib/conjure/service/forwarded_shell.rb
 - lib/conjure/service/rails_codebase.rb
-- lib/conjure/service/rails_console.rb
-- lib/conjure/service/rails_deployment.rb
+- lib/conjure/service/database/postgres.rb
+- lib/conjure/service/database/mysql.rb
 - lib/conjure/service/rails_log_view.rb
+- lib/conjure/service/docker_host.rb
+- lib/conjure/service/database.rb
+- lib/conjure/service/cloud_server.rb
+- lib/conjure/service/forwarded_shell.rb
 - lib/conjure/service/rails_server.rb
-- lib/conjure/service/rake_task.rb
 - lib/conjure/service/remote_file_set.rb
 - lib/conjure/service/remote_shell.rb
+- lib/conjure/service/rails_console.rb
+- lib/conjure/service/rake_task.rb
+- lib/conjure/service/docker_shell.rb
 - lib/conjure/service/repository_link.rb
 - lib/conjure/service/volume.rb
-- lib/conjure/target.rb
-- lib/conjure/version.rb
-- lib/conjure/view/application_view.rb
+- lib/conjure/provision.rb
+- lib/conjure/notes.txt
 - lib/conjure/view/table_view.rb
+- lib/conjure/view/application_view.rb
+- README.md
+- History.md
+- License.txt
+- bin/conjure
 homepage: http://github.com/brianauton/conjure
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 1.8.28
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Magically powerful deployment for Rails applications
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: f83195bdf15bdf55eaa8d3ce3bb10ac1dae0caad
-  data.tar.gz: 37098f28d23149e7aebb192adf286884e81b77e7
-SHA512:
-  metadata.gz: 5200a75af33b8dc94bb5046cbfbd5bcdcb37b3d528006df08728561a2970bc405289b403df10431c71621223a71e5ad1f8bf5bbed4c298416384bf91b7b0e5ab
-  data.tar.gz: 792f7d9702ffb3215e078126b5992bacc01799b455e491fa17ce47ba7a31fc9fd7d5ca18ea3ba87a819cd0b448ae6a44d53f18a1b8237582fef0d69b99f8d311

data/lib/conjure/service/rails_deployment.rb

@@ -1,39 +0,0 @@
-module Conjure
-  module Service
-    class RailsDeployment
-      def initialize(options)
-        @origin = options[:origin]
-        @branch = options[:branch] || "master"
-        @environment = "production"
-        @test = options[:test]
-        @target = options[:target]
-      end
-
-      def deploy
-        Log.info "[deploy] Deploying #{@branch} to #{@environment}"
-        unless @test
-          codebase.install
-          rails.run
-          Log.info "[deploy] Application deployed to #{@target.ip_address}"
-        end
-      end
-
-      def database
-        codebase.database
-      end
-
-      def codebase
-        @codebase ||= Service::RailsCodebase.new @target, @origin, @branch, @environment
-      end
-
-      def rails
-        @rails ||= Service::RailsServer.new @target, @environment
-      end
-
-      def shell
-        rails.base_image
-      end
-    end
-  end
-end
-