conjure 0.1.0 → 0.1.1

data/History.md

@@ -1,3 +1,8 @@
+### Version 0.1.1
+2013-11-05
+
+* Support Docker 0.6.5
+
 ### Version 0.1.0
 2013-10-24
 

data/lib/conjure.rb

@@ -1,6 +1,6 @@
 module Conjure
 
-  VERSION = "0.1.0" unless defined?(VERSION)
+  VERSION = "0.1.1" unless defined?(VERSION)
   autoload :Command, "conjure/command"
   autoload :Config, "conjure/config"
   autoload :Service, "conjure/service"
@@ -8,4 +8,8 @@ module Conjure
   def self.config
     @config ||= Config.load Dir.pwd
   end
+
+  def self.log(message)
+    puts message
+  end
 end

data/lib/conjure/command.rb

@@ -51,7 +51,7 @@ module Conjure
     def application
       self.application_options ||= {}
       self.application_options[:origin] ||= github_url
-      Service::RailsApplication.create self.application_options
+      Service::RailsApplication.new self.application_options
     end
 
     def github_url

data/lib/conjure/config.rb

@@ -5,7 +5,21 @@ module Conjure
       config_path = File.join root_path, "config", "conjure.yml"
       data = YAML.load_file config_path
       data["config_path"] = File.dirname config_path
-      OpenStruct.new data
+      new data
+    end
+
+    def initialize(options)
+      @options = options
+    end
+
+    def method_missing(name)
+      return @options[name.to_s] if @options.has_key? name.to_s
+      super
+    end
+
+    def file_contents(name)
+      name = @options[name.to_s] if name.is_a? Symbol
+      File.open File.join(@options["config_path"], name), "rb", &:read
     end
   end
 end

data/lib/conjure/service.rb

@@ -9,15 +9,4 @@ module Conjure
     autoload :PostgresDatabase, "conjure/service/postgres_database"
     autoload :RemoteShell, "conjure/service/remote_shell"
   end
-
-  class Basic
-    def self.create(*args)
-      new(*args)
-    end
-
-    def file_contents(file_path)
-      file_path = File.join Conjure.config.config_path, file_path
-      `cat #{file_path}`
-    end
-  end
 end

data/lib/conjure/service/cloud_server.rb

@@ -1,7 +1,8 @@
 module Conjure
   module Service
-    class CloudServer < Basic
+    class CloudServer
       require "fog"
+      require "digest/md5"
 
       def initialize(name)
         @name = name
@@ -17,7 +18,7 @@ module Conjure
 
       def upload_files(files)
         dir_names = files.map{|local_path, remote_path| File.dirname remote_path}.uniq
-        server.ssh "mkdir -p #{dir_names.join ' '}" if dir_names.any?
+        run "mkdir -p #{dir_names.join ' '}" if dir_names.any?
         files.each{|local_path, remote_path| server.scp local_path, remote_path}
       end
 
@@ -38,12 +39,12 @@ module Conjure
 
       def existing_server
         server = connection.servers.find{|s| s.name == @name }
-        puts " [cloud] Using existing server #{@name}" if server
+        Conjure.log " [cloud] Using existing server #{@name}" if server
         server
       end
 
       def new_server
-        puts " [cloud] Launching new server #{@name}"
+        Conjure.log " [cloud] Launching new server #{@name}"
         connection.servers.bootstrap bootstrap_options.merge(fog_credentials)
       end
 
@@ -81,6 +82,7 @@ module Conjure
       end
 
       def set_fog_credentials
+        Fog.credential = fog_key_identifier
         Fog.credentials.merge! fog_credentials
       end
 
@@ -99,6 +101,10 @@ module Conjure
         }
       end
 
+      def fog_key_identifier
+        "conjure_#{Digest::MD5.hexdigest(File.read public_key_file)[0..7]}"
+      end
+
       def remote_shell
         @remote_shell ||= RemoteShell.new(
           :ip_address => server.public_ip_address,

data/lib/conjure/service/docker_host.rb

@@ -1,6 +1,6 @@
 module Conjure
   module Service
-    class DockerHost < Basic
+    class DockerHost
       VERBOSE = false
 
       def initialize(server_name)
@@ -8,7 +8,7 @@ module Conjure
       end
 
       def server
-        @server ||= Service::CloudServer.create @server_name
+        @server ||= Service::CloudServer.new @server_name
       end
 
       def ip_address
@@ -16,7 +16,7 @@ module Conjure
       end
 
       def new_docker_path
-        puts "[docker] Installing docker"
+        Conjure.log "[docker] Installing docker"
         server.run "dd if=/dev/zero of=/root/swapfile bs=1024 count=524288"
         server.run "mkswap /root/swapfile; swapon /root/swapfile"
         server.run "curl https://get.docker.io/gpg | apt-key add -"
@@ -29,7 +29,7 @@ module Conjure
       def existing_docker_path
         path = server.run("which docker").stdout.to_s.strip
         path = nil if path == ""
-        puts "[docker] Using installed #{path}" if path
+        Conjure.log "[docker] Using installed #{path}" if path
         path
       end
 
@@ -42,8 +42,8 @@ module Conjure
         full_command = "#{docker_path} #{command}"
         full_command = "nohup #{full_command}" if options[:nohup]
         full_command = "echo '#{shell_escape options[:stdin]}' | #{full_command}" if options[:stdin]
-        puts "   [scp] #{options[:files].inspect}" if VERBOSE and options[:files]
-        puts "   [ssh] #{full_command}" if VERBOSE
+        Conjure.log "   [scp] #{options[:files].inspect}" if VERBOSE and options[:files]
+        Conjure.log "   [ssh] #{full_command}" if VERBOSE
         result = server.run full_command, :stream_stdin => options[:stream_stdin], :files => options[:files], &block
         raise "Docker error: #{result.stdout} #{result.stderr}" unless result.status == 0
         result.stdout
@@ -109,16 +109,17 @@ module Conjure
 
       def run(command = "")
         unless running_container
-          puts "[docker] Starting #{@label}"
-          run_options = @host_volumes ? host_volume_options(@host_volumes) : ""
+          Conjure.log "[docker] Starting #{@label}"
+          run_options = host_volume_options(@host_volumes)
+          run_options += port_options(@ports)
           command = shell_command command if command != ""
-          container_id = @host.command("run #{run_options} -d #{installed_image_name} #{command}").strip
+          container_id = @host.command("run #{run_options.join ' '} -d #{installed_image_name} #{command}").strip
           if(!running_container)
             output = @host.command "logs #{container_id}"
             raise "Docker: #{@label} daemon exited with: #{output}"
           end
         end
-        puts "[docker] #{@label} is running at #{running_container.ip_address}"
+        Conjure.log "[docker] #{@label} is running at #{running_container.ip_address}"
         running_container
       end
 
@@ -137,7 +138,6 @@ module Conjure
         lines = ["FROM #{base_image_name}"]
         lines += @environment.map{|k, v| "ENV #{k} #{v}"} if @environment
         lines += @setup_commands.map{|c| "RUN #{c}"}
-        lines << "EXPOSE #{@ports.map{|p| "#{p}:#{p}"}.join ' '}" if @ports.to_a.any?
         lines << "VOLUME #{@volumes.inspect}" if @volumes.to_a.any?
         lines << "ENTRYPOINT #{@daemon_command}" if @daemon_command
         lines.join "\n"
@@ -149,24 +149,28 @@ module Conjure
 
       def build
         destroy_instances
-        puts "[docker] Building #{@label} image"
+        Conjure.log "[docker] Building #{@label} image"
         raise_build_errors(@host.command "build -t #{expected_image_name} -", stdin: dockerfile)
         @host.containers.destroy_all_stopped
       end
 
       def command(command, options = {}, &block)
         destroy_instances
-        file_options = options[:files] ? "-v /files:/files" : ""
-        file_options += " "+host_volume_options(@host_volumes) if @host_volumes
-        file_options += " -i" if options[:stream_stdin]
-        @host.command "run #{file_options} #{installed_image_name} #{shell_command command}", :stream_stdin => options[:stream_stdin], :files => files_hash(options[:files]), &block
+        file_options = options[:files] ? ["-v /files:/files"] : []
+        file_options += host_volume_options(@host_volumes)
+        file_options << "-i" if options[:stream_stdin]
+        @host.command "run #{file_options.join ' '} #{installed_image_name} #{shell_command command}", :stream_stdin => options[:stream_stdin], :files => files_hash(options[:files]), &block
       end
 
       def host_volume_options(host_volumes)
-        host_volumes.map do |host_path, container_path|
+        host_volumes.to_a.map do |host_path, container_path|
           @host.ensure_host_directory host_path
           "-v=#{host_path}:#{container_path}:rw"
-        end.join " "
+        end
+      end
+
+      def port_options(ports)
+        ports.to_a.map {|port| "-p=#{port}:#{port}" }
       end
 
       def files_hash(files_array)
@@ -212,7 +216,7 @@ module Conjure
 
       def destroy_all(options)
         while container = find(:image_name => options[:image_name]) do
-          puts "[docker] Stopping #{options[:image_name]}"
+          Conjure.log "[docker] Stopping #{options[:image_name]}"
           host.command "stop #{container.id}"
           host.command "rm #{container.id}"
         end

data/lib/conjure/service/machine_instance.rb

@@ -2,7 +2,7 @@ require "vagrant"
 
 module Conjure
   module Service
-    class MachineInstance < Basic
+    class MachineInstance
       def start
         @config_path = File.expand_path "../../../../config", __FILE__
         load_environment

data/lib/conjure/service/postgres_database.rb

@@ -1,6 +1,6 @@
 module Conjure
   module Service
-    class PostgresDatabase < Basic
+    class PostgresDatabase
       def initialize(host, db_name)
         @host = host
         @db_name = db_name
@@ -49,12 +49,12 @@ module Conjure
         File.open file, "w" do |f|
           f.write base_image.command("#{bin_path}/pg_dump #{client_options} #{@db_name}")
         end
-        puts "[export] #{File.size file} bytes exported to #{file}"
+        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]
-        puts "[import] #{File.size file} bytes imported from #{file}"
+        Conjure.log "[import] #{File.size file} bytes imported from #{file}"
       end
 
       def client_options

data/lib/conjure/service/rails_application.rb

@@ -1,6 +1,6 @@
 module Conjure
   module Service
-    class RailsApplication < Basic
+    class RailsApplication
       def initialize(options)
         @origin = options[:origin]
         @name = name_from_origin @origin
@@ -10,29 +10,29 @@ module Conjure
       end
 
       def deploy
-        puts "[deploy] Deploying #{@name}:#{@branch} to #{@environment}"
+        Conjure.log "[deploy] Deploying #{@name}:#{@branch} to #{@environment}"
         unless @test
           database.run
           codebase.install
           rails.run
-          puts "[deploy] Application deployed to #{docker.ip_address}"
+          Conjure.log "[deploy] Application deployed to #{docker.ip_address}"
         end
       end
 
       def docker
-        @docker ||= Service::DockerHost.create "#{@name}-#{@environment}"
+        @docker ||= Service::DockerHost.new "#{@name}-#{@environment}"
       end
 
       def database
-        @database ||= Service::PostgresDatabase.create docker, "#{@name}_#{@environment}"
+        @database ||= Service::PostgresDatabase.new docker, "#{@name}_#{@environment}"
       end
 
       def codebase
-        @codebase ||= Service::RailsCodebase.create docker, @origin, @branch, @name, database.ip_address, @environment
+        @codebase ||= Service::RailsCodebase.new docker, @origin, @branch, @name, database.ip_address, @environment
       end
 
       def rails
-        @rails ||= Service::RailsServer.create docker, @name, @environment
+        @rails ||= Service::RailsServer.new docker, @name, @environment
       end
 
       def name_from_origin(origin)

data/lib/conjure/service/rails_codebase.rb

@@ -1,14 +1,14 @@
 module Conjure
   module Service
-    class RailsCodebase < Basic
+    class RailsCodebase
       def initialize(host, github_url, branch, app_name, database_ip_address, rails_environment)
         @github_url = github_url
         @branch = branch
         @app_name = app_name
         @database_ip_address = database_ip_address
         @rails_environment = rails_environment
-        github_private_key = file_contents(Conjure.config.private_key_file).gsub("\n", "\\n")
-        github_public_key = file_contents(Conjure.config.public_key_file).gsub("\n", "\\n")
+        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",
@@ -47,22 +47,22 @@ module Conjure
       end
 
       def checkout_code
-        puts "[  repo] Checking out code from git"
+        Conjure.log "[  repo] Checking out code from git"
         @image.command "git clone -b #{@branch} #{@github_url}"
       end
 
       def fetch_code_updates
-        puts "[  repo] Fetching code updates from git"
+        Conjure.log "[  repo] Fetching code updates from git"
         @image.command "cd #{@app_name}; git reset --hard; git checkout #{@branch}; git pull"
       end
 
       def configure_database
-        puts "[  repo] Generating database.yml"
+        Conjure.log "[  repo] Generating database.yml"
         @image.command "echo '#{database_yml}' >/#{@app_name}/config/database.yml"
       end
 
       def configure_logs
-        puts "[  repo] Configuring application logger"
+        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"
       end

data/lib/conjure/service/rails_server.rb

@@ -1,6 +1,6 @@
 module Conjure
   module Service
-    class RailsServer < Basic
+    class RailsServer
       def initialize(host, app_name, rails_environment)
         @host = host
         @app_name = app_name
@@ -53,7 +53,7 @@ module Conjure
       end
 
       def install_gems
-        puts "[ rails] Installing gems"
+        Conjure.log "[ rails] Installing gems"
         base_image.command "cd #{@app_name}; bundle --deployment"
       end
 
@@ -62,17 +62,17 @@ module Conjure
       end
 
       def database_exists
-        puts "[ rails] Checking the database status"
+        Conjure.log "[ rails] Checking the database status"
         base_image.command("cd #{@app_name}; bundle exec rake db:version; true").include? "Current version:"
       end
 
       def migrate_database
-        puts "[ rails] Migrating the database"
+        Conjure.log "[ rails] Migrating the database"
         base_image.command "cd #{@app_name}; bundle exec rake db:migrate"
       end
 
       def initialize_database
-        puts "[ rails] Setting up the database"
+        Conjure.log "[ rails] Setting up the database"
         base_image.command "cd #{@app_name}; bundle exec rake db:setup"
       end
 
@@ -105,7 +105,7 @@ module Conjure
       end
 
       def ruby_version
-        file_contents("../.ruby-version").strip
+        Conjure.config.file_contents("../.ruby-version").strip
       end
 
       def apt_packages_required_for_gems

data/lib/conjure/service/remote_shell.rb

@@ -3,7 +3,12 @@ module Conjure
     class RemoteShell
       require "net/ssh"
 
-      def initialize(options)
+      class << self
+        attr_accessor :ssh_service
+      end
+      @ssh_service = Net::SSH
+
+      def initialize(options = {})
         @options = options
       end
     
@@ -37,11 +42,15 @@ module Conjure
       def session
         session_options = {
           :auth_methods => ["publickey"],
-          :key_data => File.read(@options[:private_key_path]),
+          :key_data => key_data,
           :keys_only => true,
           :paranoid => false,
         }
-        @session ||= Net::SSH.start @options[:ip_address], @options[:username], session_options
+        @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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjure
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog