conjure 0.1.4 → 0.1.5

data/History.md

@@ -1,3 +1,8 @@
+### Version 0.1.5
+2013-11-22
+
+* Add --verbose flag for debugging
+
 ### Version 0.1.4
 2013-11-19
 

data/lib/conjure.rb

@@ -4,8 +4,4 @@ module Conjure
   def self.config
     @config ||= Config.load Dir.pwd
   end
-
-  def self.log(message)
-    puts message
-  end
 end

data/lib/conjure/command.rb

@@ -4,6 +4,12 @@ module Conjure
   class Command < Thor
     attr_accessor :application_options
 
+    class_option :verbose, :aliases => "-v", :type => :boolean, :desc => "Show details of low-level operations for debugging"
+    def initialize(*args)
+      super
+      Log.level = :debug if options[:verbose]
+    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"

data/lib/conjure/log.rb

@@ -0,0 +1,15 @@
+module Conjure
+  class Log
+    class << self
+      attr_accessor :level
+    end
+
+    def self.info(message)
+      puts message
+    end
+
+    def self.debug(message)
+      puts message if @level == :debug
+    end
+  end
+end

data/lib/conjure/service/cloud_server.rb

@@ -3,6 +3,7 @@ module Conjure
     class CloudServer
       require "fog"
       require "digest/md5"
+      require "pathname"
 
       def initialize(name)
         @name = name
@@ -39,12 +40,12 @@ module Conjure
 
       def existing_server
         server = connection.servers.find{|s| s.name == @name }
-        Conjure.log " [cloud] Using existing server #{@name}" if server
+        Log.info " [cloud] Using existing server #{@name}" if server
         server
       end
 
       def new_server
-        Conjure.log " [cloud] Launching new server #{@name}"
+        Log.info " [cloud] Launching new server #{@name}"
         connection.servers.bootstrap bootstrap_options.merge(fog_credentials)
       end
 

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

@@ -48,12 +48,12 @@ module Conjure
           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}"
+          Log.info "[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}"
+          Log.info "[import] #{File.size file} bytes imported from #{file}"
         end
 
         def client_options

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

@@ -52,12 +52,12 @@ module Conjure
           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}"
+          Log.info "[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}"
+          Log.info "[import] #{File.size file} bytes imported from #{file}"
         end
 
         def client_options

data/lib/conjure/service/docker_host.rb

@@ -3,8 +3,6 @@ require 'digest/sha1'
 module Conjure
   module Service
     class DockerHost
-      VERBOSE = false
-
       def initialize(server_name)
         @server_name = server_name
       end
@@ -18,7 +16,7 @@ module Conjure
       end
 
       def new_docker_path
-        Conjure.log "[docker] Installing docker"
+        Log.info "[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 -"
@@ -31,7 +29,7 @@ module Conjure
       def existing_docker_path
         path = server.run("which docker").stdout.to_s.strip
         path = nil if path == ""
-        Conjure.log "[docker] Using installed #{path}" if path
+        Log.info "[docker] Using installed #{path}" if path
         path
       end
 
@@ -44,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]
-        Conjure.log "   [scp] #{options[:files].inspect}" if VERBOSE and options[:files]
-        Conjure.log "   [ssh] #{full_command}" if VERBOSE
+        Log.debug "   [scp] #{options[:files].inspect}" if options[:files]
+        Log.debug "   [ssh] #{full_command}"
         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
@@ -117,7 +115,7 @@ module Conjure
 
       def run(command = "")
         unless running_container
-          Conjure.log "[docker] Starting #{@label}"
+          Log.info "[docker] Starting #{@label}"
           run_options = host_volume_options(@host_volumes)
           run_options += port_options(@ports)
           command = shell_command command if command != ""
@@ -127,7 +125,7 @@ module Conjure
             raise "Docker: #{@label} daemon exited with: #{output}"
           end
         end
-        Conjure.log "[docker] #{@label} is running at #{running_container.ip_address}"
+        Log.info "[docker] #{@label} is running at #{running_container.ip_address}"
         running_container
       end
 
@@ -157,7 +155,7 @@ module Conjure
 
       def build
         destroy_instances
-        Conjure.log "[docker] Building #{@label} image"
+        Log.info "[docker] Building #{@label} image"
         raise_build_errors(@host.command "build -t #{expected_image_name} -", stdin: dockerfile)
         @host.containers.destroy_all_stopped
       end
@@ -225,7 +223,7 @@ module Conjure
 
       def destroy_all(options)
         while container = find(:image_name => options[:image_name]) do
-          Conjure.log "[docker] Stopping #{options[:image_name]}"
+          Log.info "[docker] Stopping #{options[:image_name]}"
           host.command "stop #{container.id}"
           host.command "rm #{container.id}"
         end

data/lib/conjure/service/rails_application.rb

@@ -10,11 +10,11 @@ module Conjure
       end
 
       def deploy
-        Conjure.log "[deploy] Deploying #{@name}:#{@branch} to #{@environment}"
+        Log.info "[deploy] Deploying #{@name}:#{@branch} to #{@environment}"
         unless @test
           codebase.install
           rails.run
-          Conjure.log "[deploy] Application deployed to #{docker.ip_address}"
+          Log.info "[deploy] Application deployed to #{docker.ip_address}"
         end
       end
 

data/lib/conjure/service/rails_codebase.rb

@@ -42,12 +42,12 @@ module Conjure
       end
 
       def configure_database
-        Conjure.log "[  repo] Generating database.yml"
+        Log.info "[  repo] Generating database.yml"
         volume.write "config/database.yml", database_yml
       end
 
       def configure_logs
-        Conjure.log "[  repo] Configuring application logger"
+        Log.info "[  repo] Configuring application logger"
         setup = 'Rails.logger = Logger.new "#{Rails.root}/log/#{Rails.env}.log"'
         volume.write "config/initializers/z_conjure_logger.rb", setup
       end

data/lib/conjure/service/rails_server.rb

@@ -50,7 +50,7 @@ module Conjure
       end
 
       def install_gems
-        Conjure.log "[ rails] Installing gems"
+        Log.info "[ rails] Installing gems"
         base_image.command "cd #{@app_name}; bundle --deployment"
       end
 
@@ -59,17 +59,17 @@ module Conjure
       end
 
       def database_exists
-        Conjure.log "[ rails] Checking the database status"
+        Log.info "[ rails] Checking the database status"
         base_image.command("cd #{@app_name}; bundle exec rake db:version; true").include? "Current version:"
       end
 
       def migrate_database
-        Conjure.log "[ rails] Migrating the database"
+        Log.info "[ rails] Migrating the database"
         base_image.command "cd #{@app_name}; bundle exec rake db:migrate"
       end
 
       def initialize_database
-        Conjure.log "[ rails] Setting up the database"
+        Log.info "[ rails] Setting up the database"
         base_image.command "cd #{@app_name}; bundle exec rake db:setup"
       end
 

data/lib/conjure/service/remote_shell.rb

@@ -12,18 +12,13 @@ module Conjure
         @options = options
       end
     
-      def run(command, options = {})
-        stdout, stderr, exit_status = ["", "", nil]
+      def run(command, options = {}, &block)
+        result = nil
         session.open_channel do |channel|
           channel.request_pty
           channel.exec command do |c, success|
             raise "Failed to execute command via SSH" unless success
-            channel.on_data do |c, data|
-              yield data if block_given?
-              stdout << data
-            end
-            channel.on_extended_data { |c, type, data| stderr << data }
-            channel.on_request("exit-status") { |c, data| exit_status = data.read_long }
+            result = Result.new(channel, &block)
           end
           if options[:stream_stdin]
             channel.on_process do
@@ -36,9 +31,9 @@ module Conjure
         else
           session.loop
         end
-        Result.new stdout, stderr, exit_status
+        result
       end
-      
+
       def session
         session_options = {
           :auth_methods => ["publickey"],
@@ -58,8 +53,20 @@ module Conjure
       ensure
         system "stty -raw echo"
       end
+
+      class Result
+        attr_accessor :stdout, :stderr, :status
+        def initialize(channel)
+          @stdout, @stderr = "", ""
+          channel.on_data do |c, data|
+            yield data if block_given?
+            @stdout << data
+          end
+          channel.on_extended_data { |c, type, data| @stderr << data }
+          channel.on_request("exit-status") { |c, data| @status = data.read_long }
+        end
+      end
     end
 
-    Result = Struct.new(:stdout, :stderr, :status)
   end
 end

data/lib/conjure/service/repository_link.rb

@@ -19,12 +19,12 @@ module Conjure
       end
 
       def checkout_code
-        Conjure.log "[  repo] Checking out code from git"
+        Log.info "[  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"
+        Log.info "[  repo] Fetching code updates from git"
         git_shell.command "cd #{code_path}; git reset --hard; git checkout #{@branch}; git pull"
       end
 

data/lib/conjure/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjure
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -113,6 +113,7 @@ files:
 - lib/conjure/service/docker_host.rb
 - lib/conjure/service/docker_shell.rb
 - lib/conjure/service/database.rb
+- lib/conjure/log.rb
 - lib/conjure/config.rb
 - lib/conjure/version.rb
 - lib/conjure/command.rb