conjure 0.1.2 → 0.1.3

data/History.md

@@ -1,3 +1,8 @@
+### Version 0.1.3
+2013-11-12
+
+* Deploy apps that use MySQL
+
 ### Version 0.1.2
 2013-11-06
 

data/README.md

@@ -20,8 +20,8 @@ Also, your Rails application requires all of the following:
   * It must have a `.ruby-version` file indicating which version of
     Ruby to run
 
-  * It must be able to run in production mode with a single
-    Postgres database (any existing database.yml will be ignored)
+  * It must be able to run in production mode with a single Postgres
+    or MySQL database (any existing database.yml will be ignored)
 
   * It must be checked out locally into a git repository with a valid
     `origin` remote
@@ -85,15 +85,18 @@ deploy`.
 
 #### Export
 
-Produce a Postgres SQL dump of the currently-deployed server's
-production database, and save it to the local file `FILE`.
+Produce a native-format (Postgres or MySQL) dump of the
+currently-deployed server's production database, and save it to the
+local file `FILE`.
 
     conjure export FILE
 
 #### Import
 
 Overwrite the production database on the currently-deployed server
-with a Postgres SQL dump from the local file `FILE`.
+with a dump from the local file `FILE`. The dump should be in the same
+format as that produced by the `export` command (either a Postgres or
+MySQL dump according to the database type).
 
     conjure import FILE
 

data/lib/conjure.rb

@@ -1,9 +1,5 @@
 module Conjure
-
-  VERSION = "0.1.2" unless defined?(VERSION)
-  autoload :Command, "conjure/command"
-  autoload :Config, "conjure/config"
-  autoload :Service, "conjure/service"
+  Dir[File.join(File.dirname(__FILE__), "conjure/**/*.rb")].each { |f| require f }
 
   def self.config
     @config ||= Config.load Dir.pwd

data/lib/conjure/service/database.rb

@@ -0,0 +1,25 @@
+module Conjure
+  module Service
+    class Database
+      def self.new(options)
+        services_by_gem.each do |gem_name, service_class|
+          if options[:codebase].gem_names.include? gem_name
+            return service_class.new(
+              :docker_host => options[:docker_host],
+              :database_name => options[:codebase].database_name,
+              :adapter_name => adapters_by_gem[gem_name],
+            )
+          end
+        end
+      end
+
+      def self.services_by_gem
+        {"pg" => Postgres, "mysql2" => Mysql, "mysql" => Mysql}
+      end
+
+      def self.adapters_by_gem
+        {"pg" => "postgresql", "mysql2" => "mysql2", "mysql" => "mysql"}
+      end
+    end
+  end
+end

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

@@ -0,0 +1,71 @@
+module Conjure
+  module Service
+    class Database
+      class Mysql
+        def initialize(options)
+          @host = options[:docker_host]
+          @db_name = options[:database_name]
+          @adapter_name = options[:adapter_name]
+        end
+
+        def base_image
+          @base_image ||= @host.images.create(
+            label: "mysql",
+            base_image: "ubuntu",
+            setup_commands: [
+              "apt-get install -y mysql-server mysql-client"
+            ],
+          )
+        end
+
+        def server_image
+          @server_image ||= @host.images.create(
+            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",
+            ],
+            daemon_command: "/usr/sbin/mysqld --bind-address=0.0.0.0",
+            volumes: ["/var/lib/mysql"],
+          )
+        end
+
+        def run
+          container
+        end
+
+        def container
+          @container ||= server_image.run
+        end
+
+        def name
+          @db_name
+        end
+
+        def ip_address
+          container.ip_address
+        end
+
+        def export(file)
+          File.open file, "w" do |f|
+            f.write base_image.command("/usr/bin/mysqldump #{client_options}")
+          end
+          Conjure.log "[export] #{File.size file} bytes exported to #{file}"
+        end
+
+        def import(file)
+          base_image.command "echo 'source /files/#{File.basename file}' | /usr/bin/mysql #{client_options}", files: [file]
+          Conjure.log "[import] #{File.size file} bytes imported from #{file}"
+        end
+
+        def client_options
+          "-u root -h #{ip_address} #{@db_name}"
+        end
+
+        def adapter_name
+          @adapter_name || "mysql2"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,79 @@
+module Conjure
+  module Service
+    class Database
+      class Postgres
+        def initialize(options)
+          @host = options[:docker_host]
+          @db_name = options[:database_name]
+        end
+
+        def base_image
+          @base_image ||= @host.images.create(
+            label: "postgres",
+            base_image: "ubuntu",
+            setup_commands: [
+              "apt-get install -y python-software-properties software-properties-common",
+              "add-apt-repository -y ppa:pitti/postgresql",
+              "apt-get update",
+              "apt-get install -y postgresql-9.2 postgresql-client-9.2 postgresql-contrib-9.2",
+            ],
+          )
+        end
+
+        def server_image
+          @server_image ||= @host.images.create(
+            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",
+              "echo \"listen_addresses='*'\" >>/etc/postgresql/9.2/main/postgresql.conf",
+            ],
+            daemon_command: "su postgres -c '#{bin_path}/postgres -c config_file=/etc/postgresql/9.2/main/postgresql.conf'",
+            volumes: ["/var/lib/postgresql/9.2/main"],
+          )
+        end
+
+        def run
+          container
+        end
+
+        def container
+          @container ||= server_image.run
+        end
+
+        def name
+          @db_name
+        end
+
+        def ip_address
+          container.ip_address
+        end
+
+        def export(file)
+          File.open file, "w" do |f|
+            f.write base_image.command("#{bin_path}/pg_dump #{client_options} #{@db_name}")
+          end
+          Conjure.log "[export] #{File.size file} bytes exported to #{file}"
+        end
+
+        def import(file)
+          base_image.command "#{bin_path}/psql #{client_options} -d #{@db_name} -f /files/#{File.basename file}", files: [file]
+          Conjure.log "[import] #{File.size file} bytes imported from #{file}"
+        end
+
+        def client_options
+          "-U root -h #{ip_address}"
+        end
+
+        def bin_path
+          "/usr/lib/postgresql/9.2/bin"
+        end
+
+        def adapter_name
+          "postgresql"
+        end
+      end
+    end
+  end
+end

data/lib/conjure/service/docker_host.rb

@@ -206,7 +206,8 @@ module Conjure
       end
 
       def find(options)
-        image_name = options[:image_name]
+        image_name = options[:image_name].clone
+        image_name << ":" unless image_name.include? ":"
         id = host.command("ps | grep #{image_name} ; true").strip.split("\n").first.to_s[0..11]
         id = nil if id == ""
         Container.new(:host => host, :id => id) if id

data/lib/conjure/service/rails_application.rb

@@ -12,7 +12,6 @@ module Conjure
       def deploy
         Conjure.log "[deploy] Deploying #{@name}:#{@branch} to #{@environment}"
         unless @test
-          database.run
           codebase.install
           rails.run
           Conjure.log "[deploy] Application deployed to #{docker.ip_address}"
@@ -24,11 +23,11 @@ module Conjure
       end
 
       def database
-        @database ||= Service::PostgresDatabase.new docker, "#{@name}_#{@environment}"
+        codebase.database
       end
 
       def codebase
-        @codebase ||= Service::RailsCodebase.new docker, @origin, @branch, @name, database.ip_address, @environment
+        @codebase ||= Service::RailsCodebase.new docker, @origin, @branch, @name, @environment
       end
 
       def rails

data/lib/conjure/service/rails_codebase.rb

@@ -1,15 +1,15 @@
 module Conjure
   module Service
     class RailsCodebase
-      def initialize(host, github_url, branch, app_name, database_ip_address, rails_environment)
+      def initialize(host, github_url, branch, app_name, rails_environment)
         @github_url = github_url
         @branch = branch
         @app_name = app_name
-        @database_ip_address = database_ip_address
         @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(
+        @image = @host.images.create(
           label: "codebase",
           base_image: "ubuntu",
           setup_commands: [
@@ -26,10 +26,10 @@ module Conjure
       def database_yml
         {
           @rails_environment => {
-            "adapter" => "postgresql",
-            "database" => "#{@app_name}_#{@rails_environment}",
+            "adapter" => database.adapter_name,
+            "database" => database.name,
             "encoding" => "utf8",
-            "host" => @database_ip_address,
+            "host" => database.ip_address,
             "username" => "root",
             "template" => "template0",
           }
@@ -66,6 +66,19 @@ module Conjure
         setup = 'Rails.logger = Logger.new "#{Rails.root}/log/#{Rails.env}.log"'
         @image.command "echo '#{setup}' >/#{@app_name}/config/initializers/z_conjure_logger.rb"
       end
+
+      def database_name
+        "#{@app_name}_#{@rails_environment}"
+      end
+
+      def gem_names
+        gemfile = @image.command "cat #{@app_name}/Gemfile"
+        gemfile.scan(/gem ['"]([^'"]+)['"]/).flatten
+      end
+
+      def database
+        @database ||= Database.new :docker_host => @host, :codebase => self
+      end
     end
   end
 end

data/lib/conjure/service/rails_server.rb

@@ -109,7 +109,7 @@ module Conjure
       end
 
       def apt_packages_required_for_gems
-        ["libpq-dev"]
+        ["libpq-dev", "libmysqlclient-dev"]
       end
     end
   end

data/lib/conjure/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjure
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: vagrant
+  name: unf
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -104,12 +104,13 @@ files:
 - lib/conjure/service/rails_server.rb
 - lib/conjure/service/rails_codebase.rb
 - lib/conjure/service/rails_application.rb
-- lib/conjure/service/machine_instance.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/postgres_database.rb
+- lib/conjure/service/database.rb
 - lib/conjure/config.rb
-- lib/conjure/service.rb
+- lib/conjure/version.rb
 - lib/conjure/command.rb
 - README.md
 - History.md

data/lib/conjure/service.rb

@@ -1,12 +0,0 @@
-module Conjure
-  module Service
-    autoload :RailsApplication, "conjure/service/rails_application"
-    autoload :RailsCodebase, "conjure/service/rails_codebase"
-    autoload :RailsServer, "conjure/service/rails_server"
-    autoload :MachineInstance, "conjure/service/machine_instance"
-    autoload :DockerHost, "conjure/service/docker_host"
-    autoload :CloudServer, "conjure/service/cloud_server"
-    autoload :PostgresDatabase, "conjure/service/postgres_database"
-    autoload :RemoteShell, "conjure/service/remote_shell"
-  end
-end

data/lib/conjure/service/machine_instance.rb

@@ -1,54 +0,0 @@
-require "vagrant"
-
-module Conjure
-  module Service
-    class MachineInstance
-      def start
-        @config_path = File.expand_path "../../../../config", __FILE__
-        load_environment
-        install_base_image
-        @vm = @vagrant.primary_vm
-        start_vm
-        issue_test_command
-      end
-
-      def load_environment
-        @vagrant = Vagrant::Environment.new :cwd => @config_path
-      end
-
-      def install_base_image
-        unless @vagrant.boxes.find "precise64"
-          puts "Downloading 300MB Ubuntu base image for Vagrant, this may take a few minutes..."
-          @vagrant.boxes.add "precise64", "http://files.vagrantup.com/precise64.box"
-          load_environment
-        end
-      end
-
-      def start_vm
-        unless @vm.state == :running
-          puts "Starting a VM..."
-          @vm.up
-        end
-      end
-
-      def ssh_address
-        info = @vm.ssh.info
-        "#{info[:username]}@#{info[:host]}"
-      end
-
-      def ssh_options
-        info = @vm.ssh.info
-        "-p #{info[:port]} -i #{info[:private_key_path]}"
-      end
-
-      def remote_command_output(command)
-        command.gsub! "'", "'\\\\''"
-        `ssh #{ssh_address} #{ssh_options} '#{command}'`
-      end
-
-      def issue_test_command
-      puts "OS info reported by the VM: #{remote_command_output 'uname -mrs'}"
-      end
-    end
-  end
-end

data/lib/conjure/service/postgres_database.rb

@@ -1,69 +0,0 @@
-module Conjure
-  module Service
-    class PostgresDatabase
-      def initialize(host, db_name)
-        @host = host
-        @db_name = db_name
-      end
-
-      def base_image
-        @base_image ||= @host.images.create(
-          label: "postgres",
-          base_image: "ubuntu",
-          setup_commands: [
-            "apt-get install -y python-software-properties software-properties-common",
-            "add-apt-repository -y ppa:pitti/postgresql",
-            "apt-get update",
-            "apt-get install -y postgresql-9.2 postgresql-client-9.2 postgresql-contrib-9.2",
-          ],
-        )
-      end
-
-      def server_image
-        @server_image ||= @host.images.create(
-          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",
-            "echo \"listen_addresses='*'\" >>/etc/postgresql/9.2/main/postgresql.conf",
-          ],
-          daemon_command: "su postgres -c '#{bin_path}/postgres -c config_file=/etc/postgresql/9.2/main/postgresql.conf'",
-          volumes: ["/var/lib/postgresql/9.2/main"],
-        )
-      end
-
-      def run
-        container
-      end
-
-      def container
-        @container ||= server_image.run
-      end
-
-      def ip_address
-        container.ip_address
-      end
-
-      def export(file)
-        File.open file, "w" do |f|
-          f.write base_image.command("#{bin_path}/pg_dump #{client_options} #{@db_name}")
-        end
-        Conjure.log "[export] #{File.size file} bytes exported to #{file}"
-      end
-
-      def import(file)
-        base_image.command "#{bin_path}/psql #{client_options} -d #{@db_name} -f /files/#{File.basename file}", files: [file]
-        Conjure.log "[import] #{File.size file} bytes imported from #{file}"
-      end
-
-      def client_options
-        "-U root -h #{ip_address}"
-      end
-
-      def bin_path
-        "/usr/lib/postgresql/9.2/bin"
-      end
-    end
-  end
-end