conjure 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58a9a73a25cd4300e2bd4bdf5184a43c824ac548
-  data.tar.gz: 24a8eed9346681d7010d459d3e5de5a9bb106feb
+  metadata.gz: f83195bdf15bdf55eaa8d3ce3bb10ac1dae0caad
+  data.tar.gz: 37098f28d23149e7aebb192adf286884e81b77e7
 SHA512:
-  metadata.gz: e0e0dadb4bab906cb2ef594d8827ba57f4c553daa09068646945952882dac1a03cdec41feb411a90d62ccef5504f6d7a358ebcd64176b283c646796ec015a670
-  data.tar.gz: 70e583f8ef4c570da0054ef44038c4028c372226bb962713d09cb14fafb0072344a9db066022bd7d2f061ffc6c038b8fe168e6d389456e1064809fc787c0e522
+  metadata.gz: 5200a75af33b8dc94bb5046cbfbd5bcdcb37b3d528006df08728561a2970bc405289b403df10431c71621223a71e5ad1f8bf5bbed4c298416384bf91b7b0e5ab
+  data.tar.gz: 792f7d9702ffb3215e078126b5992bacc01799b455e491fa17ce47ba7a31fc9fd7d5ca18ea3ba87a819cd0b448ae6a44d53f18a1b8237582fef0d69b99f8d311

data/History.md

@@ -1,3 +1,9 @@
+### Version 0.1.8
+2014-1-24
+
+* Add `show` command to list deployed instances
+* Fix dockerfile error caused by unset environment variables
+
 ### Version 0.1.7
 2014-1-14
 

data/README.md

@@ -116,3 +116,9 @@ Open a console on the deployed application.
 Run a rake task on the deployed application and show the output.
 
     conjure rake [ARGUMENTS...]
+
+#### Show
+
+List the current status of all deployed instances of your command.
+
+    conjure show

data/lib/conjure/application.rb

@@ -1,28 +1,31 @@
 module Conjure
   class Application
-    attr_reader :origin_url, :name
+    attr_reader :origin
 
-    def initialize(options = {})
-      @origin_url = options[:origin_url] || find_origin_url(options[:path])
-      @name = find_name(@origin_url) if @origin_url
+    def self.find(options = {})
+      new(options)
     end
 
     def instances
-      Instance.find(:application => self)
+      Instance.where(:application => self)
     end
 
     def data_sets
       DataSet.find(:application => self)
     end
 
+    def name
+      match = @origin.match(/\/([^.]+)\.git$/) if @origin
+      match[1] if match
+    end
+
     private
 
-    def find_name(origin_url)
-      match = origin_url.match(/\/([^.]+)\.git$/)
-      match[1] if match
+    def initialize(options = {})
+      @origin = options[:origin] || origin_from_path(options[:path])
     end
 
-    def find_origin_url(path)
+    def origin_from_path(path)
       return unless path
       remote_info = `cd #{path}; git remote -v |grep origin`
       match = remote_info.match(/(git@github.com[^ ]+)/)

data/lib/conjure/command.rb

@@ -50,18 +50,23 @@ module Conjure
       end
     end
 
+    desc "show", "Show info on deployed instances"
+    def show
+      puts View::ApplicationView.new(application).render
+    end
+
     default_task :help
 
     private
 
     def application
-      @application ||= Application.new(:path => Dir.pwd, :origin_url => options[:origin])
+      @application ||= Application.find(:path => Dir.pwd, :origin => options[:origin])
     end
 
     def deployment
       @deployment ||= Service::RailsDeployment.new({
         :branch => options[:branch],
-        :origin => application.origin_url,
+        :origin => application.origin,
         :target => target,
         :test => options[:test],
       })

data/lib/conjure/config.rb

@@ -3,8 +3,12 @@ module Conjure
     def self.load(root_path)
       require "ostruct"
       config_path = File.join root_path, "config", "conjure.yml"
-      data = YAML.load_file config_path
-      data["config_path"] = File.dirname config_path
+      if File.exists? config_path
+        data = YAML.load_file config_path
+        data["config_path"] = File.dirname config_path
+      else
+        data = {}
+      end
       new data
     end
 

data/lib/conjure/instance.rb

@@ -1,7 +1,41 @@
 module Conjure
   class Instance
-    def self.find(options = {})
-      []
+    attr_reader :application, :ip_address, :rails_environment
+
+    def initialize(options)
+      @application = options[:application]
+      @ip_address = options[:ip_address]
+      @rails_environment = options[:rails_environment]
+    end
+
+    def self.where(options = {})
+      Collection.new(options)
+    end
+
+    def status
+      "running"
+    end
+
+    class Collection
+      include Enumerable
+
+      def initialize(options)
+        @application = options[:application]
+      end
+
+      def server
+        @server ||= Service::CloudServer.new("#{@application.name}-production") if @application
+      end
+
+      def each(&block)
+        if server and server.existing_server
+          yield Instance.new(
+            :application => @application,
+            :rails_environment => "production",
+            :ip_address => server.ip_address
+          )
+        end
+      end
     end
   end
 end

data/lib/conjure/log.rb

@@ -2,14 +2,25 @@ module Conjure
   class Log
     class << self
       attr_accessor :level
+      attr_accessor :capture
+      attr_reader :history
     end
 
     def self.info(message)
-      puts message
+      if @capture
+        @history ||= ""
+        @history << "#{message}\n"
+      else
+        puts message
+      end
     end
 
     def self.debug(message)
-      puts message if @level == :debug
+      info message if @level == :debug
+    end
+
+    def self.clear
+      @history = ""
     end
   end
 end

data/lib/conjure/notes.txt

@@ -1,4 +1,10 @@
-Application.deploy should become Deployment.create
+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
+  Deployment.deploy should become Deployment.create
 
 Instead of passing DockerHost objects around, pass something that
 knows how to provision OS shells (possibly from multiple sources).
@@ -56,3 +62,46 @@ stderr) streams ("Console"?). This is what's returned by a rake task
 or rails console instantiation, to connect it to the user's console,
 and it can also be returned from a CommandShell to give the user
 direct access to that as well.
+
+"Show" output prototype:
+
+# Showing application status (Conjure v1.2.23)
+#        Origin  git@github.com/brianauton/conjure
+# Authorization  OK (using public key)
+# 
+# Deployed Instances:
+# Address      Environment  Branch  Revision
+# 192.168.0.1  production   master  3FA4D099 (up to date)
+#
+# Data Sets:
+# Name          Status    Size
+# production-2  active    2GB
+# production-1  archived  2MB
+
+# Showing instance status (Conjure v1.2.23)
+#     Address  192.168.0.1
+# Environment  production
+#      Branch  master
+#    Revision  3FA4D099 (behind by 2 commits)
+#      Uptime  2 days, 3 hours, 17 minutes
+
+Could have "named" instances ("production-2", user-specified names,
+etc) but "address" is enough to identify instances for now. Should
+guess the specified instance by either ip address, subdomain (when
+supported), or rails_env. Need "deploy" to be a shorthand for either
+"create" or "update" since "deploy staging" is ambiguous if there's
+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
+  Support changing env/branch when updating
+  Support default instance params based on addr/env/other info given
+  Destroy instances
+  Introduce "platforms"
+  Deploy to local docker
+  Deploy to vagrant (?)
+  Progress display
+  Used stored docker images for faster deployment

data/lib/conjure/service/cloud_server.rb

@@ -25,13 +25,11 @@ module Conjure
       end
 
       def ip_address
-        @server.public_ip_address
+        server.public_ip_address
       end
 
       def existing_server
-        server = connection.servers.find{|s| s.name == @name }
-        Log.info " [cloud] Using existing server #{@name}" if server
-        server
+        @existing_server ||= connection.servers.find{|s| s.name == @name } if connection
       end
 
       def new_server
@@ -46,7 +44,7 @@ module Conjure
       end
 
       def connection
-        @connection ||= Fog::Compute.new account.compute_options
+        @connection ||= Fog::Compute.new account.compute_options if account
       end
 
       def add_resource_id(options, type)

data/lib/conjure/service/docker_host.rb

@@ -141,13 +141,19 @@ module Conjure
 
       def dockerfile
         lines = ["FROM #{base_image_name}"]
-        lines += @environment.map{|k, v| "ENV #{k} #{v}"} if @environment
+        lines += dockerfile_environment_entries
         lines += @setup_commands.map{|c| "RUN #{c}"}
         lines << "VOLUME #{@volumes.inspect}" if @volumes.to_a.any?
         lines << "ENTRYPOINT #{@daemon_command}" if @daemon_command
         lines.join "\n"
       end
 
+      def dockerfile_environment_entries
+        @environment.to_a.map do |k, v|
+          "ENV #{k} #{v}" if v.to_s != ""
+        end.compact
+      end
+
       def base_image_name
         @base_image.respond_to?(:installed_image_name) ? @base_image.installed_image_name : @base_image
       end

data/lib/conjure/version.rb

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

data/lib/conjure/view/application_view.rb

@@ -0,0 +1,42 @@
+require "conjure"
+
+module Conjure
+  module View
+    class ApplicationView
+      def initialize(application)
+        @application = application
+        @instances = @application.instances
+      end
+
+      def render
+        [application_content, instances_content].join "\n\n"
+      end
+
+      private
+
+      def application_content
+        content = ["Showing application status (Conjure v#{Conjure::VERSION})"]
+        content << "Origin  #{@application.origin}"
+        content.join "\n"
+      end
+
+      def instances_content
+        content = ["Deployed Instances:"]
+        content << instances_table
+        content << "(none)" unless @instances.any?
+        content.join "\n"
+      end
+
+      def instances_table
+        data = @instances.map do |instance|
+          {
+            "Address" => instance.ip_address,
+            "Environment" => instance.rails_environment,
+            "Status" => instance.status,
+          }
+        end
+        TableView.new(data).render
+      end
+    end
+  end
+end

data/lib/conjure/view/table_view.rb

@@ -0,0 +1,38 @@
+module Conjure
+  module View
+    class TableView
+      def initialize(data)
+        @data = data
+        calculate_widths
+      end
+
+      def render
+        rows = [@width.map{|col, width| pad_to_width(col, width)}.join(column_separator)]
+        rows += @data.map do |row|
+          @width.map{|col, width| pad_to_width(row[col], width)}.join(column_separator)
+        end
+        rows.join("\n")
+      end
+
+      private
+
+      def column_separator
+        "  "
+      end
+
+      def pad_to_width(string, width)
+        string.to_s + " "*(width - string.to_s.length)
+      end
+
+      def calculate_widths
+        @width = {}
+        @data.each do |row|
+          row.each_pair do |key, value|
+            @width[key] ||= key.to_s.length
+            @width[key] = [@width[key], value.to_s.length].max
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjure
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Brian Auton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,8 @@ files:
 - lib/conjure/service/volume.rb
 - lib/conjure/target.rb
 - lib/conjure/version.rb
+- lib/conjure/view/application_view.rb
+- lib/conjure/view/table_view.rb
 homepage: http://github.com/brianauton/conjure
 licenses:
 - MIT