fucking_shell_scripts 1.0 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c05b1d90cd1b92a78231e67b153532b29b54024a
-  data.tar.gz: c8706137b7ac4f46d8f8498ff07db9d06db9b23b
+  metadata.gz: cfaa228c38443797804d539ab63ad3a197e7ebce
+  data.tar.gz: ea89afabcdd4f99e2bbd6a8044eae1ac2f4de1f1
 SHA512:
-  metadata.gz: adf82e3996b4c1fdbebfe60218c6566eb79057f7bc479524c5e11d3c7664c452b943b4aa0b6ae75e96b18fc463d718482d5356953928910dbe017c2236f655e5
-  data.tar.gz: fb5aed54b314a49cebd5f0574b851525ab62a9adf7d32fdadcb2e748194d75426540d9863f9429ff64da26256604e5c1dd0f02b26796b0dd797904306d422ebc
+  metadata.gz: 06191dd2a421a302608dab1ad2e8cd307cf8145d1a2c14cba9caf678dde92822137f0e3a2bfb27b04f9392f9d423fdbbbbbb24071c9123ad5cda9515c3a8da33
+  data.tar.gz: 354e24319fb9afe6bee357c39b52f8749acb8433c4a4e2874ec9f82789c985eba03531b5b50f16ec896380d03c4c97309ce4bf2f73ebab8c4921d1533d62612d

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.rspec-local

data/README.md

@@ -108,8 +108,8 @@ availability_zone: us-east-1d
 key_name: global-key
 cloud:
   provider: AWS
-  aws_access_key_id: <=% ENV[AWS_ACCESS_KEY] %>
-  aws_secret_access_key: <%= ENV[AWS_SECRET_ACCESS_KEY] %>
+  aws_access_key_id: <%= ENV["AWS_ACCESS_KEY"] %>
+  aws_secret_access_key: <%= ENV["AWS_SECRET_ACCESS_KEY"] %>
   region: us-east-1
 
 ```

data/lib/fucking_shell_scripts/server.rb

@@ -15,33 +15,38 @@ module FuckingShellScripts
     end
 
     def build
-      @server = connection.servers.create(
-        image_id: options.fetch(:image),
-        flavor_id: options.fetch(:size),
-        key_name: options.fetch(:key_name),
-        tags: { "Name" => name },
-        groups: options.fetch(:security_groups),
+      create_server_options = {
+        image_id:         options.fetch(:image),
+        flavor_id:        options.fetch(:size),
+        key_name:         options.fetch(:key_name),
+        tags:             { "Name" => name },
+        groups:           options.fetch(:security_groups),
         private_key_path: options.fetch(:private_key_path)
-      )
-      @server.username = options.fetch(:username) if options.fetch(:username)
-      print "Creating #{options.fetch(:size)} from #{options.fetch(:image)}"
+      }
+
+      create_server_options.merge!({subnet_id: options[:subnet]}) if options.has_key?(:subnet)
+      create_server_options.merge!({block_device_mapping: options[:block_device_mapping]}) if options.has_key?(:block_device_mapping)
+
+      @server = connection.servers.create(create_server_options)
+      @server.username = options.fetch(:username) if options[:username]
+      $stdout.print "Creating #{options.fetch(:size)} from #{options.fetch(:image)}"
 
       server.wait_for do
-        print "."
+        $stdout.print "."
         ready?
       end
 
-      puts "ready!"
-      puts ""
+      $stdout.puts "ready!"
+      $stdout.puts ""
 
-      print "Waiting for ssh access"
+      $stdout.print "Waiting for ssh access"
 
       server.wait_for do
-        print "."
+        $stdout.print "."
         sshable?
       end
 
-      puts "#{server.dns_name} ready!"
+      $stdout.puts "#{server.dns_name} ready!"
     end
 
     def configure
@@ -60,6 +65,7 @@ module FuckingShellScripts
       raise FuckingShellScripts::Server::MissingInstanceID , "Please specify the instance ID using the --instance-id option." if instance_id.nil?
       @server = connection.servers.get(instance_id)
       @server.private_key_path = options.fetch(:private_key_path)
+      @server.username = options.fetch(:username) if options[:username]
       @server
     end
 

data/lib/fucking_shell_scripts/version.rb

@@ -1,3 +1,3 @@
 module FuckingShellScripts
-  VERSION = "1.0"
+  VERSION = "1.1"
 end

data/spec/fucking_shell_scripts/server_spec.rb

@@ -0,0 +1,87 @@
+require 'spec_helper'
+require 'fog/aws/models/compute/server'
+require 'fog/aws/models/compute/servers'
+
+module FuckingShellScripts
+  describe Server do
+    describe '#build' do
+
+      let(:image)             { 'some image' }
+      let(:size)              { 'some size' }
+      let(:name)              { 'some name' }
+      let(:key_name)          { 'some key_name' }
+      let(:security_groups)   { 'some security_groups' }
+      let(:private_key_path)  { 'some private_key_path' }
+      let(:connection)        { double(Fog::Compute) }
+      let!(:time)             { Time.now }
+
+      let(:options) do
+        {
+          image:            image,
+          size:             size,
+          name:             name,
+          key_name:         key_name,
+          security_groups:  security_groups,
+          private_key_path: private_key_path
+        }
+      end
+
+      let(:expected_options) do
+       {
+          image_id:         image,
+          flavor_id:        size,
+          key_name:         key_name,
+          tags:             { "Name" => "#{name.downcase.sub(/ /, '-')}-#{time.strftime("%y-%m-%d-%H-%M")}" },
+          groups:           security_groups,
+          private_key_path: private_key_path
+        }
+      end
+
+      subject { Server.new(connection, options).build }
+
+      let(:servers) { double(Fog::Compute::AWS::Servers) }
+      let(:server)  { double(Fog::Compute::AWS::Server, wait_for: nil, dns_name: nil) }
+
+      before(:each) do
+        allow(connection).to receive(:servers).and_return(servers)
+        allow(Time).to receive(:now).and_return(time)
+        allow($stdout).to receive(:puts)
+        allow($stdout).to receive(:print)
+      end
+
+      it 'creates a server with the passed in options' do
+        expect(servers).to receive(:create).with(expected_options).and_return(server)
+
+        subject
+      end
+
+      context 'when options include subnet' do
+        it 'creates a server with the passed in options including the subnet' do
+          options.merge!({subnet: 'some subnet'})
+          expect(servers).to receive(:create).with(hash_including({subnet_id: 'some subnet'})).and_return(server)
+
+          Server.new(connection, options).build
+        end
+      end
+
+      context 'when options include block_device_mapping' do
+        it 'creates a server with the passed in options including the block_device_mapping' do
+          block_device_mapping = {
+            block_device_mapping: [
+              {
+                'DeviceName'     => '/dev/sda1',
+                'Ebs.VolumeSize' => '20',
+                'Ebs.VolumeType' => 'gp2'
+              }
+            ]
+          }
+          options.merge!(block_device_mapping)
+          expect(servers).to receive(:create).with(hash_including(block_device_mapping)).and_return(server)
+
+          Server.new(connection, options).build
+        end
+      end
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fucking_shell_scripts
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
 platform: ruby
 authors:
 - Brandon Hilkert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,6 +109,7 @@ files:
 - spec/core_ext/hash_spec.rb
 - spec/fucking_shell_scripts/cli_spec.rb
 - spec/fucking_shell_scripts/connection_spec.rb
+- spec/fucking_shell_scripts/server_spec.rb
 - spec/spec_helper.rb
 - spec/support/servers/test-server.yml
 homepage: https://github.com/brandonhilkert/fucking_shell_scripts
@@ -140,5 +141,6 @@ test_files:
 - spec/core_ext/hash_spec.rb
 - spec/fucking_shell_scripts/cli_spec.rb
 - spec/fucking_shell_scripts/connection_spec.rb
+- spec/fucking_shell_scripts/server_spec.rb
 - spec/spec_helper.rb
 - spec/support/servers/test-server.yml