conjure 0.1.3 → 0.1.4

data/History.md

@@ -1,3 +1,8 @@
+### Version 0.1.4
+2013-11-19
+
+* Use SSH agent forwarding to deploy with the user's personal keys
+
 ### Version 0.1.3
 2013-11-12
 

data/README.md

@@ -43,7 +43,7 @@ and then running `bundle`, OR by installing it directly:
 
 Then add a file to your Rails project called
 `config/conjure.yml`. This should be a YAML file with the following
-fields (all fields are required):
+fields:
 
   * `digitalocean_client_id` and `digitalocean_api_key`: These
     credentials are available after logging in to your Digital Ocean
@@ -52,20 +52,17 @@ fields (all fields are required):
   * `digitalocean_region`: The geographic region for deploying new
     cloud servers. If unsure, use "New York 1".
 
-  * `private_key_file` and `public_key_file`: Pathnames to local files
-    (relative to your project's `config` directory) that contain the
-    private and public SSH keys to use for deployment. It's
-    recommended to generate a new keypair rather than using your
-    personal SSH keys, since Conjure currently copies the specified
-    private key to the server during deployment.
+  * `private_key_file` and `public_key_file` (optional): Pathnames to
+    local files (absolute paths, or relative to your project's
+    `config` directory) that contain the private and public SSH keys
+    to use for deployment. If these aren't specified, Conjure will try
+    to find identity files in `~/.ssh`.
 
 Here's an example conjure.yml file:
 
     digitalocean_client_id: XXXXXXXX
     digitalocean_api_key: XXXXXXXX
     digitalocean_region: New York 1
-    private_key_file: conjure_key
-    public_key_file: conjure_key.pub
 
 Finally, tell Conjure to deploy your app:
 

data/lib/conjure/config.rb

@@ -10,6 +10,7 @@ module Conjure
 
     def initialize(options)
       @options = options
+      find_default_keys unless @options["private_key"]
     end
 
     def method_missing(name)
@@ -19,7 +20,22 @@ module Conjure
 
     def file_contents(name)
       name = @options[name.to_s] if name.is_a? Symbol
-      File.open File.join(@options["config_path"], name), "rb", &:read
+      name = File.join(@options["config_path"], name) unless name[0] == "/"
+      File.open name, "rb", &:read
+    end
+
+    private
+
+    def find_default_keys
+      private_key_paths = ["~/.ssh/id_rsa", "~/.ssh/id_dsa", "~/.ssh/identity"]
+      private_key_paths.each do |path|
+        path = File.expand_path(path)
+        if File.exists?(path) and File.exists?("#{path}.pub")
+          @options["private_key_file"] = path
+          @options["public_key_file"] = "#{path}.pub"
+          return
+        end
+      end
     end
   end
 end

data/lib/conjure/service/cloud_server.rb

@@ -109,7 +109,6 @@ module Conjure
         @remote_shell ||= RemoteShell.new(
           :ip_address => server.public_ip_address,
           :username => "root",
-          :private_key_path => private_key_file,
         )
       end
     end

data/lib/conjure/service/database/mysql.rb

@@ -9,9 +9,8 @@ module Conjure
         end
 
         def base_image
-          @base_image ||= @host.images.create(
+          @base_image ||= @host.shell.prepare(
             label: "mysql",
-            base_image: "ubuntu",
             setup_commands: [
               "apt-get install -y mysql-server mysql-client"
             ],
@@ -19,9 +18,8 @@ module Conjure
         end
 
         def server_image
-          @server_image ||= @host.images.create(
+          @server_image ||= base_image.prepare(
             label: "mysqlserver",
-            base_image: base_image,
             setup_commands: [
               "/usr/sbin/mysqld & sleep 5; echo \"GRANT ALL ON *.* TO root@'%' IDENTIFIED BY '' WITH GRANT OPTION\" | /usr/bin/mysql",
             ],

data/lib/conjure/service/database/postgres.rb

@@ -8,9 +8,8 @@ module Conjure
         end
 
         def base_image
-          @base_image ||= @host.images.create(
+          @base_image ||= @host.shell.prepare(
             label: "postgres",
-            base_image: "ubuntu",
             setup_commands: [
               "apt-get install -y python-software-properties software-properties-common",
               "add-apt-repository -y ppa:pitti/postgresql",
@@ -21,9 +20,8 @@ module Conjure
         end
 
         def server_image
-          @server_image ||= @host.images.create(
+          @server_image ||= base_image.prepare(
             label: "pgserver",
-            base_image: base_image,
             setup_commands: [
               "service postgresql start; su postgres -c 'createuser -d -r -s root; createdb -O root root'; service postgresql stop",
               "echo 'host all all 0.0.0.0/0 trust' >>/etc/postgresql/9.2/main/pg_hba.conf",

data/lib/conjure/service/docker_host.rb

@@ -66,6 +66,10 @@ module Conjure
       def containers
         ContainerSet.new :host => self
       end
+
+      def shell
+        DockerShell.new :docker_host => self
+      end
     end
 
     class ImageSet
@@ -79,6 +83,8 @@ module Conjure
     end
 
     class Image
+      attr_reader :host_volumes
+
       def initialize(host, options)
         @host = host
         @label = options[:label]

data/lib/conjure/service/docker_shell.rb

@@ -0,0 +1,46 @@
+module Conjure
+  module Service
+    class DockerShell
+      attr_reader :docker_host
+
+      def initialize(options)
+        @docker_host = options[:docker_host]
+        @image = options[:image]
+      end
+
+      def prepare(options)
+        self.class.new(
+          :docker_host => @docker_host,
+          :image => @docker_host.images.create(image_options.merge options),
+        )
+      end
+
+      def command(*args)
+        (@image || default_image).command *args
+      end
+
+      def run(*args)
+        (@image || default_image).run *args
+      end
+
+      def stop(*args)
+        (@image || default_image).stop *args
+      end
+
+      def image_options
+        {
+          :base_image => (@image || default_image_name),
+          :host_volumes => (@image.host_volumes if @image),
+        }
+      end
+
+      def default_image
+        @default_image ||= @docker_host.images.create(image_options)
+      end
+
+      def default_image_name
+        "ubuntu"
+      end
+    end
+  end
+end

data/lib/conjure/service/forwarded_shell.rb

@@ -0,0 +1,25 @@
+module Conjure
+  module Service
+    class ForwardedShell
+      def initialize(options)
+        @shell = options[:shell].prepare(
+          :label => "forwarded",
+          :setup_commands => [
+            "apt-get install -y openssh-server",
+            "mkdir -p /var/run/sshd",
+            "mkdir -p /root/.ssh; echo '#{options[:public_key]}' > /root/.ssh/authorized_keys",
+            "chmod 600 /root/.ssh/authorized_keys"
+          ],
+        )
+      end
+
+      def command(c)
+        container = @shell.run "/usr/sbin/sshd -D -e"
+        escaped_command = @shell.docker_host.shell_escape c
+        ssh_command = "ssh -A -o StrictHostKeyChecking=no #{container.ip_address} '#{escaped_command}'"
+        result = @shell.docker_host.server.run ssh_command
+        result.stdout
+      end
+    end
+  end
+end

data/lib/conjure/service/rails_codebase.rb

@@ -7,20 +7,6 @@ module Conjure
         @app_name = app_name
         @rails_environment = rails_environment
         @host = host
-        github_private_key = Conjure.config.file_contents(:private_key_file).gsub("\n", "\\n")
-        github_public_key = Conjure.config.file_contents(:public_key_file).gsub("\n", "\\n")
-        @image = @host.images.create(
-          label: "codebase",
-          base_image: "ubuntu",
-          setup_commands: [
-            "apt-get install -y git",
-            "mkdir -p /root/.ssh; echo '#{github_private_key}' > /root/.ssh/id_rsa",
-            "mkdir -p /root/.ssh; echo '#{github_public_key}' > /root/.ssh/id_rsa.pub",
-            "chmod -R go-rwx /root/.ssh",
-            "echo 'Host github.com\\n\\tStrictHostKeyChecking no\\n' >> /root/.ssh/config",
-          ],
-          host_volumes: {"/rails_app" => "/#{app_name}"},
-        )
       end
 
       def database_yml
@@ -37,34 +23,33 @@ module Conjure
       end
 
       def install
-        code_checked_out ? fetch_code_updates : checkout_code
+        repository_link.update
         configure_database
         configure_logs
       end
 
-      def code_checked_out
-        @image.command("[ -d #{@app_name}/.git ] && echo yes; true").strip == "yes"
-      end
-
-      def checkout_code
-        Conjure.log "[  repo] Checking out code from git"
-        @image.command "git clone -b #{@branch} #{@github_url}"
+      def repository_link
+        @repository_link ||= RepositoryLink.new(
+          :volume => volume,
+          :branch => @branch,
+          :origin_url => @github_url,
+          :public_key => Conjure.config.file_contents(:public_key_file).gsub("\n", "\\n"),
+        )
       end
 
-      def fetch_code_updates
-        Conjure.log "[  repo] Fetching code updates from git"
-        @image.command "cd #{@app_name}; git reset --hard; git checkout #{@branch}; git pull"
+      def volume
+        @volume ||= Volume.new(:docker_host => @host, :host_path => "/rails_app", :container_path => "/#{@app_name}")
       end
 
       def configure_database
         Conjure.log "[  repo] Generating database.yml"
-        @image.command "echo '#{database_yml}' >/#{@app_name}/config/database.yml"
+        volume.write "config/database.yml", database_yml
       end
 
       def configure_logs
         Conjure.log "[  repo] Configuring application logger"
         setup = 'Rails.logger = Logger.new "#{Rails.root}/log/#{Rails.env}.log"'
-        @image.command "echo '#{setup}' >/#{@app_name}/config/initializers/z_conjure_logger.rb"
+        volume.write "config/initializers/z_conjure_logger.rb", setup
       end
 
       def database_name
@@ -72,8 +57,7 @@ module Conjure
       end
 
       def gem_names
-        gemfile = @image.command "cat #{@app_name}/Gemfile"
-        gemfile.scan(/gem ['"]([^'"]+)['"]/).flatten
+        volume.read("Gemfile").scan(/gem ['"]([^'"]+)['"]/).flatten
       end
 
       def database

data/lib/conjure/service/rails_server.rb

@@ -8,9 +8,8 @@ module Conjure
       end
 
       def base_image
-        @base_image ||= @host.images.create(
+        @base_image ||= @host.shell.prepare(
           label: "rails_base",
-          base_image: "ubuntu",
           setup_commands: [
             "apt-get install -y curl git",
             "curl -L https://get.rvm.io | bash -s stable",
@@ -35,14 +34,12 @@ module Conjure
       end
 
       def server_image
-        @server_image ||= @host.images.create(
+        @server_image ||= base_image.prepare(
           label: "rails_server",
-          base_image: base_image,
           ports: [80],
           environment: {
             PATH:"/usr/local/rvm/gems/ruby-1.9.3-p448@global/bin:/usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
           },
-          host_volumes: {"/rails_app" => "/#{@app_name}"},
         )
       end
 

data/lib/conjure/service/remote_shell.rb

@@ -42,17 +42,12 @@ module Conjure
       def session
         session_options = {
           :auth_methods => ["publickey"],
-          :key_data => key_data,
-          :keys_only => true,
           :paranoid => false,
+          :forward_agent => true,
         }
         @session ||= self.class.ssh_service.start @options[:ip_address], @options[:username], session_options
       end
 
-      def key_data
-        File.read @options[:private_key_path] if @options[:private_key_path]
-      end
-
       def poll_stream(stream, &block)
         yield stream.sysread(1) if IO.select([stream], nil, nil, 0.01)
       end

data/lib/conjure/service/repository_link.rb

@@ -0,0 +1,47 @@
+module Conjure
+  module Service
+    class RepositoryLink
+      def initialize(options)
+        @volume = options[:volume]
+        @branch = options[:branch]
+        @origin_url = options[:origin_url]
+        @public_key = options[:public_key]
+      end
+
+      def update
+        code_checked_out ? fetch_code_updates : checkout_code
+      end
+
+      private
+
+      def code_checked_out
+        git_shell.command("[ -d #{code_path}/.git ] && echo yes; true").strip == "yes"
+      end
+
+      def checkout_code
+        Conjure.log "[  repo] Checking out code from git"
+        git_shell.command "git clone -b #{@branch} #{@origin_url} #{code_path}"
+      end
+
+      def fetch_code_updates
+        Conjure.log "[  repo] Fetching code updates from git"
+        git_shell.command "cd #{code_path}; git reset --hard; git checkout #{@branch}; git pull"
+      end
+
+      def code_path
+        @volume.container_path
+      end
+
+      def git_shell
+        @git_shell ||= ForwardedShell.new(:shell => @volume.shell.prepare({
+          label: "git",
+          setup_commands: [
+            "apt-get install -y git",
+            "mkdir -p /root/.ssh",
+            "echo 'Host github.com\\n\\tStrictHostKeyChecking no\\n' >> /root/.ssh/config",
+          ],
+        }), :public_key => @public_key)
+      end
+    end
+  end
+end

data/lib/conjure/service/volume.rb

@@ -0,0 +1,28 @@
+module Conjure
+  module Service
+    class Volume
+      attr_reader :docker_host, :container_path
+
+      def initialize(options)
+        @docker_host = options[:docker_host]
+        @host_path = options[:host_path]
+        @container_path = options[:container_path]
+      end
+
+      def read(filename)
+        shell.command "cat #{@container_path}/#{filename}"
+      end
+
+      def write(filename, data)
+        shell.command "echo '#{data}' >#{@container_path}/#{filename}"
+      end
+
+      def shell
+        @shell ||= @docker_host.shell.prepare(
+          :label => "volume",
+          :host_volumes => {@host_path => @container_path},
+        )
+      end
+    end
+  end
+end

data/lib/conjure/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjure
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -104,10 +104,14 @@ files:
 - lib/conjure/service/rails_server.rb
 - lib/conjure/service/rails_codebase.rb
 - lib/conjure/service/rails_application.rb
+- lib/conjure/service/forwarded_shell.rb
+- lib/conjure/service/repository_link.rb
+- lib/conjure/service/volume.rb
 - lib/conjure/service/database/postgres.rb
 - lib/conjure/service/database/mysql.rb
 - lib/conjure/service/remote_shell.rb
 - lib/conjure/service/docker_host.rb
+- lib/conjure/service/docker_shell.rb
 - lib/conjure/service/database.rb
 - lib/conjure/config.rb
 - lib/conjure/version.rb