guignol 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3122effa5c76fb24af333186992f6746ec24ce1d
-  data.tar.gz: 871d6fcb768cd9de2aa8319d46a7b0c78c8489cf
+  metadata.gz: 602a8585b6cfa0db283f93cdfba5b3cf3b83df95
+  data.tar.gz: 5612487338b4c8fc3fc38fd1faf281443568746c
 SHA512:
-  metadata.gz: 6697a1414b262ceb5856635b64622f7208d9fde7e91baa77b80e1b92af2e91a56bfbbdbd79ee4085094a99457c1b715d4a97efd370d99ae0511ff20fabfa2e99
-  data.tar.gz: 168039823e8ae50ed47fecfc19a2279a283164d07b56ed45c479d20403a2e2ed9dbdc58026e700e8ed1bc4ec2db77fb3ae988bdb351cdf112efd01380ed66d10
+  metadata.gz: fbd093e9fc9047efc71bb618af7c5f87a6ee827509ef8f7aeb6aad2748fe91f98642628151e663a291d18cbb8ebf7a19ca4a956f9ec57bc053e222b6690cfecf
+  data.tar.gz: bf1dc14babf9a08fbdec9ef987a967756de7caa4f9fc3b4bb643b13401e0fc98f70d781ce08b259a864426bc38af66d88ec85bd184bb6972767f8c9eaac9de2f

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 1.9.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    guignol (0.3.9)
+    guignol (0.3.10)
       activesupport
       fog (~> 1.12.0)
       parallel (~> 0.6.2)
@@ -11,13 +11,13 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.0.0)
+    activesupport (4.0.1)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    atomic (1.1.10)
+    atomic (1.1.14)
     builder (3.2.2)
     coderay (1.0.9)
     diff-lcs (1.2.4)
@@ -33,11 +33,11 @@ GEM
       nokogiri (~> 1.5.0)
       ruby-hmac
     formatador (0.2.4)
-    i18n (0.6.4)
+    i18n (0.6.5)
     method_source (0.8.1)
-    mime-types (1.23)
+    mime-types (1.25)
     minitest (4.7.5)
-    multi_json (1.7.7)
+    multi_json (1.8.2)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (2.6.8)
@@ -61,9 +61,9 @@ GEM
     ruby-hmac (0.4.0)
     slop (3.4.5)
     thor (0.18.1)
-    thread_safe (0.1.0)
+    thread_safe (0.1.3)
       atomic
-    tzinfo (0.3.37)
+    tzinfo (0.3.38)
     uuidtools (2.1.4)
 
 PLATFORMS

data/README.md

@@ -35,6 +35,20 @@ Start by setting up your `~/.fog`:
 
 Alternatively you can pass crendentials for Guignol by setting the `AWS_SECRET_KEY_ID` and `AWS_SECRET_ACCESS_KEY` environment variables, or by setting `:aws_access_key_id` and `:aws_secret_access_key` in `guignol.yml` (see below).
 
+## Listing instances
+
+    # list all instances available
+    guignol list
+
+    # list instances that match a particular pattern
+    guignol list web
+
+    # list instances with AWS identifiers
+    guignol list <pattern> --with-instance-ids
+
+    # list instance ids only in a format suitable for being passed to `xargs` or `elba`
+    guignol list <pattern> --porcelain
+
 
 ## Creating, starting and stopping machines
 
@@ -48,7 +62,7 @@ Each instance needs at least a name an a UUID (both will become tags on your
 instance):
 
     # ~/.guignol.yml
-    --- 
+    ---
     hello-world:
       :uuid: AF123799-3F55-4F0B-8E58-87C67A5977BA
 
@@ -98,12 +112,12 @@ Yes, Guignol will also create and attach your EBS volumes when starting up insta
 Just add a `:volumes` entry to your instance configuration:
 
     :volumes:
-      - :name: fubar-swap
+      fubar-swap:
         :uuid: 9D5A278E-432C-41DB-9FB5-8AF5C1BD021F
         :dev:  /dev/sdf
         :size: 4
         :delete_on_termination: true
-      - :name: fubar-data
+      fubar-data:
         :uuid: E180203F-9DE1-4C6A-B09B-33B2FAC8F36E
         :dev:  /dev/sdg
         :size: 20
@@ -119,7 +133,7 @@ Note that Guignol does not delete volumes when tearing down instances.
 ## Optional instance configuration
 
 - `:domain`
-  The machine's domain name. If specified, Guignol will setup a 
+  The machine's domain name. If specified, Guignol will setup a
   CNAME in Route53 mapping *name*.*domain* to your EC2 instance where it
   starts it (and tear it down when stopping it.)
 
@@ -131,13 +145,13 @@ Note that Guignol does not delete volumes when tearing down instances.
 
 - `:image_id`
   The AMI to use when creating this instance. Defaults to whatever Amazon defaults it to.
-  
+
 - `:flavor_id`
   The type of instance to start. Defaults to `t1.micro` (the one with a free tier).
-  
+
 - `:key_name`
   The keypair to deploy to this instance. Default to not deploying any for security reasons (meaning you probably won't be able to log in if unset, depending on the AMI you're using).
-  
+
 - `:security_group_ids`
   A list of security groups you want your instance to be a member of.
 
@@ -160,7 +174,7 @@ Guignol parses this setting through ERB, and lets your access the configuration
 Possible use case:
 
     # ~/.guignol.yml
-    --- 
+    ---
     hello-world:
       :uuid: AF123799-3F55-4F0B-8E58-87C67A5977BA
       :domain: example.com
@@ -195,7 +209,7 @@ You can direct logging to a file of your choice by setting `GUIGNOL_LOG`.
 This one just contains 1 machine, `fubar.example.com.`
 
     # ~/.guignol.yml
-    --- 
+    ---
     fubar:
       :domain:              example.com.
       :uuid:                68C3C0C2-1BA3-465F-8626-E065E4EF9048
@@ -203,7 +217,7 @@ This one just contains 1 machine, `fubar.example.com.`
       :image_id:            ami-15f7c961
       :flavor_id:           m1.small
       :key_name:            john-doe
-      :security_group_ids:  
+      :security_group_ids:
         - sg-7e638abc
       :volumes:
         fubar-swap:
@@ -223,9 +237,9 @@ This one just contains 1 machine, `fubar.example.com.`
           export LOGGING=YES
           exec "$0" > /tmp/user_data.log 2>&1
         fi
-    
+
         mkswap -f /dev/xvdf > /dev/null && swapon /dev/xvdf
-    
+
         mount_data() {
           mount -t ext4 /dev/xvdg /mnt
         }

data/Rakefile

@@ -4,3 +4,5 @@ require 'rspec/core/rake_task'
 Bundler::GemHelper.install_tasks
 
 RSpec::Core::RakeTask.new(:spec)
+
+task :default => [:spec]

data/lib/guignol/commands/list.rb

@@ -2,9 +2,13 @@ require 'guignol/commands/base'
 
 Guignol::Shell.class_eval do
   desc 'list [PATTERNS]', 'List the status of all known instances'
+
+  option :porcelain, :type => :boolean, :aliases => %w(-p --elba -e)
+  option :with_instance_ids, :type => :boolean, :aliases => '-i'
+
   def list(*patterns)
     patterns.push('.*') if patterns.empty?
-    Guignol::Commands::List.new(patterns).run
+    Guignol::Commands::List.new(patterns, options).run
   end
 end
 
@@ -13,12 +17,24 @@ module Guignol::Commands
     private
 
     def run_on_server(instance, options = {})
+      return output_porcelain_instance_ids(instance) if options[:porcelain]
+
       synchronize do
+        if options[:with_instance_ids]
+          id = "#{ instance.id || 'unknown'} "
+          shell.say id.ljust(@max_width)
+        end
+
         shell.say instance.name.ljust(@max_width + 1)
         shell.say instance.state, colorize(instance.state)
       end
     end
 
+    def output_porcelain_instance_ids(instance)
+      return unless instance.id
+      synchronize { shell.say "#{instance.id} " }
+    end
+
     def before_run(configs, options = {})
       @max_width = configs.keys.map(&:size).max
     end

data/lib/guignol/configuration.rb

@@ -3,41 +3,43 @@ require 'active_support'
 require 'active_support/core_ext/enumerable'
 require 'guignol'
 
-module Guignol::Configuration
+module Guignol
+  module Configuration
 
-  def configuration
-    @configuration ||= load_config_file
-  end
+    def configuration
+      @configuration ||= load_config_file
+    end
 
-  private
+    private
 
-  def config_file_path
-    @config_file_path ||= [
-      Pathname.new(ENV['GUIGNOL_YML'] || '/var/nonexistent'),
-      Pathname.new('guignol.yml'),
-      Pathname.new('config/guignol.yml'),
-      Pathname.new(ENV['HOME']).join('.guignol.yml')
-    ].find(&:exist?)
-  end
+    def config_file_path
+      @config_file_path ||= [
+        Pathname.new(ENV['GUIGNOL_YML'] || '/var/nonexistent'),
+        Pathname.new('guignol.yml'),
+        Pathname.new('config/guignol.yml'),
+        Pathname.new(ENV['HOME']).join('.guignol.yml')
+      ].find(&:exist?)
+    end
 
-  # Load the config hash for the file, converting old (v0.2.0) Yaml config files.
-  def load_config_file
-    return {} if config_file_path.nil?
-    data = YAML.load(config_file_path.read)
-    return data unless data.kind_of?(Array)
-
-    # Convert the toplevel array to a hash. Same for arrays of volumes.
-    Guignol.logger.warn "Configuration file '#{config_file_path}' uses the old array format. Trying to load it."
-    raise "Instance config lacks :name" unless data.collect_key(:name).all?
-    result = data.index_by { |item| item.delete(:name) }
-    result.each_pair do |name, config|
-      next unless config[:volumes]
-      raise "Volume config lacks :name" unless config[:volumes].collect_key(:name).all?
-      config[:volumes] = config[:volumes].index_by { |item| item.delete(:name) }
+    # Load the config hash for the file, converting old (v0.2.0) Yaml config files.
+    def load_config_file
+      return {} if config_file_path.nil?
+      data = YAML.load(config_file_path.read)
+      return data unless data.kind_of?(Array)
+
+      # Convert the toplevel array to a hash. Same for arrays of volumes.
+      Guignol.logger.warn "Configuration file '#{config_file_path}' uses the old array format. Trying to load it."
+      raise "Instance config lacks :name" unless data.collect_key(:name).all?
+      result = data.index_by { |item| item.delete(:name) }
+      result.each_pair do |name, config|
+        next unless config[:volumes]
+        raise "Volume config lacks :name" unless config[:volumes].collect_key(:name).all?
+        config[:volumes] = config[:volumes].index_by { |item| item.delete(:name) }
+      end
+
+      return result
     end
 
-    return result
+    Guignol.extend(self)
   end
-
-  Guignol.extend(self)
 end

data/lib/guignol/logger.rb

@@ -1,29 +1,31 @@
 require 'logger'
 
-module Guignol::Logger
-  def logger
-    @logger ||= ::Logger.new(logger_file).tap do |logger|
-      logger.progname = 'guignol'
-      logger.formatter = Formatter.new
+module Guignol
+  module Logger
+    def logger
+      @logger ||= ::Logger.new(logger_file).tap do |logger|
+        logger.progname = 'guignol'
+        logger.formatter = Formatter.new
+      end
     end
-  end
 
 
-  private
+    private
 
-  class Formatter < ::Logger::Formatter
-    Format = "[%s] %s: %s\n"
+    class Formatter < ::Logger::Formatter
+      Format = "[%s] %s: %s\n"
 
-    def call(severity, time, progname, msg)
-      Format % [time.strftime('%F %T'), severity, msg2str(msg)]
+      def call(severity, time, progname, msg)
+        Format % [time.strftime('%F %T'), severity, msg2str(msg)]
+      end
     end
-  end
 
 
-  def logger_file
-    return File.open(ENV['GUIGNOL_LOG'] ,'a') if ENV['GUIGNOL_LOG'] 
-    $stdout.tty? ? $stdout : File.open('/dev/null','w')  
-  end
+    def logger_file
+      return File.open(ENV['GUIGNOL_LOG'] ,'a') if ENV['GUIGNOL_LOG']
+      $stdout.tty? ? $stdout : File.open('/dev/null','w')
+    end
 
-  Guignol.extend(self)
-end
+    Guignol.extend(self)
+  end
+end

data/lib/guignol/models/instance.rb

@@ -159,6 +159,10 @@ module Guignol::Models
       subject && subject.dns_name
     end
 
+    def id
+      return nil unless subject && subject.respond_to?(:id)
+      subject.id
+    end
 
   private
 
@@ -267,7 +271,7 @@ module Guignol::Models
 
 
 
-    # walks the connection for matching servers, return 
+    # walks the connection for matching servers, return
     # either the found server of nil
     def find_subject
       connection.servers.

data/lib/guignol/version.rb

@@ -1,4 +1,4 @@
 
 module Guignol
-  VERSION = "0.3.9"
-end  
+  VERSION = "0.3.10"
+end  

data/spec/guignol/instance_spec.rb

@@ -9,11 +9,6 @@ describe Guignol::Models::Instance do
     :uuid => '948DB8E9-A356-4F66-8857-165FBDF5A71F'
   }}
 
-  before(:each) do
-    # connection = stub(:servers => [])
-    # Fog::Compute.stub(:new).and_return(connection)
-  end
-
   describe '#initialize' do
     it 'should require :uuid' do
       options.delete :uuid
@@ -26,7 +21,7 @@ describe Guignol::Models::Instance do
     end
 
     it 'should pass with minimal options' do
-      subject
+      expect { subject }.to_not raise_error
     end
 
     it 'parses ERB in user data' do
@@ -36,16 +31,24 @@ describe Guignol::Models::Instance do
     end
   end
 
+  describe '#create' do
+    it 'set server tags' do
+      expected_tags = {'Name' => name, 'UUID' => options[:uuid]}
+
+      subject.connection.should_receive(:create_tags)
+        .with(anything, {'Domain' => nil}.merge(expected_tags))
+        .and_return(double(:status => 200))
 
-  shared_examples_for 'server setup' do
-    it 'set server tags'
-    it 'configures DNS properly'
-  end
+      subject.create
+    end
 
+    it "configures DNS properly" do
+      subject.should_receive(:update_dns)
+      subject.create
+    end
 
-  describe '#create' do
     it 'should pass with minimal options' do
-      subject.create
+      expect { subject.create }.to_not raise_error
     end
 
     it 'does not break when providing an availibity zone' do
@@ -63,26 +66,48 @@ describe Guignol::Models::Instance do
     it 'fails when existing volumes are in different zones'
 
     it 'starts up the server'
-
-    it_should_behave_like 'server setup'
   end
 
 
+  describe "#id" do
+    it "returns nil when there is no 'subject' (server)" do
+      instance = Guignol::Models::Instance.new(name, options)
+      instance.stub(:subject).and_return(nil)
+
+      instance.id.should be_nil
+    end
+
+    it "returns the id when 'subject' has no id" do
+      instance = Guignol::Models::Instance.new(name, options)
+      instance.stub(:subject).and_return(double)
+
+      instance.id.should be_nil
+    end
+
+    it "returns the id when 'subject' exists and has an id" do
+      instance = Guignol::Models::Instance.new(name, options)
+      instance.stub(:subject).and_return(double(:id => 'i-123456'))
+
+      instance.id.should == 'i-123456'
+    end
+  end
+
   describe '#start' do
-    it_should_behave_like 'server setup'
 
     it 'returns when the server does not exist' do
-      subject.start
+      instance = Guignol::Models::Instance.new(name, options)
+      instance.stub(:subject).and_return(nil)
+
+      instance.start.should be_nil
     end
 
     it 'returns with a server marked as "running"'
-
   end
 
 
   describe '#destroy' do
     it 'should pass with minimal options' do
-      subject.destroy
+      expect { subject.destroy }.to_not raise_error
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guignol
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Julien Letessier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-13 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -162,6 +162,7 @@ files:
 - .gitignore
 - .rspec
 - .ruby-version
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENCE