infrataster 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6deb149a0997920f69ccdb20adbdabcbb923ebb4
-  data.tar.gz: 4e9c444f8d6beee298c37286998eb6e7a6517642
+  metadata.gz: 15a7285d66344e5c446457a0087f020721a2146f
+  data.tar.gz: 031805c8c44797156c92683bd534b02a8140c4bc
 SHA512:
-  metadata.gz: e69c2d0111708ed18d616419f10515bb06283841d561d97e9935064a2e0dce16d42e9c3c02aab7adf3ceec80769cf392e2cd3b66e8765bfdbb9fca7f939cf3f4
-  data.tar.gz: 6337545b1a1fb3d1d81517ff972d214e1c91c9b3ec3499169010eb156499e1b674e31cf36909b3b558e22be45a625e0768aa8254c01d9fa35a006bd8adde7912
+  metadata.gz: f6cdc5c1a0feb0a1771557d691c6c7ff22292326f2a7fba3d9904811c8f0ce61f6905f3f5ebc38d2a8123e6e6e130bb8381c22dc4cd74d656b0b5136dea7552d
+  data.tar.gz: 3d0c51c1210d0ffdf89ef0cf3a2cac23864264f2eaced0a10778f9e8997190ceb26a7e0764af8913b7fc9c02af9b461b8d0909c07e2f2246290212d2b9a4f4f3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Infrataster Changelog
 
+## v0.1.10
+
+* rspec ~> 2.0
+
 ## v0.1.9
 
 * Add "fuzzy IP address" feature which determine IP address by CIDR or netmask.

data/README.md

@@ -143,7 +143,7 @@ You can specify SSH configuration manually too:
 ```ruby
 Infrataster::Server.define(
   # ...
-  ssh: {host: 'hostname', user: 'testuser', keys: ['/path/to/id_rsa']}
+  ssh: {host_name: 'hostname', user: 'testuser', keys: ['/path/to/id_rsa']}
 )
 ```
 

data/infrataster.gemspec

@@ -13,13 +13,14 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").delete_if do |path|
-    path.start_with?('example/')
+    path.start_with?('example/') ||
+      path.start_with?('ci/')
   end
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "rspec"
+  spec.add_runtime_dependency "rspec", '~> 2.0'
   spec.add_runtime_dependency "net-ssh"
   spec.add_runtime_dependency "net-ssh-gateway"
   spec.add_runtime_dependency "capybara"

data/lib/infrataster/version.rb

@@ -1,3 +1,3 @@
 module Infrataster
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

data/spec/unit/lib/infrataster/server_spec.rb

@@ -4,29 +4,29 @@ module Infrataster
   describe Server do
     describe "self.define" do
       it "adds a Server instance to defined_servers" do
-        described_class.define('name', 'address', {})
+        described_class.define('name', '127.0.0.1', {})
         servers = described_class.defined_servers
         expect(servers.size).to eq(1)
         expect(servers[0].name).to eq('name')
-        expect(servers[0].address).to eq('address')
+        expect(servers[0].address).to eq('127.0.0.1')
         expect(servers[0].options).to eq({})
       end
     end
 
     describe "self.find_by_name" do
       it "finds a server by name" do
-        described_class.define('name', 'address', {})
+        described_class.define('name', '127.0.0.1', {})
         server = described_class.find_by_name('name')
         expect(server.name).to eq('name')
-        expect(server.address).to eq('address')
+        expect(server.address).to eq('127.0.0.1')
         expect(server.options).to eq({})
       end
     end
 
     describe "#from" do
       it "returns 'from' server instance" do
-        described_class.define('proxy', 'address', {})
-        described_class.define('app', 'address', from: 'proxy')
+        described_class.define('proxy', '127.0.0.1', {})
+        described_class.define('app', '127.0.0.1', from: 'proxy')
         app_server = described_class.find_by_name('app')
         expect(app_server.from.name).to eq('proxy')
       end
@@ -36,7 +36,7 @@ module Infrataster
       context "with ssh option" do
         context "when options[:ssh][:host] is set" do
           it 'returns args for SSH.start' do
-            server = Server.new('name', 'address', ssh: {host_name: 'host', user: 'user'})
+            server = Server.new('name', '127.0.0.1', ssh: {host_name: 'host', user: 'user'})
             expect(server.send(:_ssh_start_args)).
               to eq(['host', 'user', {host_name: 'host', user: 'user'}])
           end
@@ -44,9 +44,9 @@ module Infrataster
 
         context "when options[:ssh][:host] is not set" do
           it 'returns args for SSH.start' do
-            server = Server.new('name', 'address', ssh: {user: 'user'})
+            server = Server.new('name', '127.0.0.1', ssh: {user: 'user'})
             expect(server.send(:_ssh_start_args)).
-              to eq(['address', 'user', {host_name: 'address', user: 'user'}])
+              to eq(['127.0.0.1', 'user', {host_name: '127.0.0.1', user: 'user'}])
           end
         end
       end
@@ -54,7 +54,7 @@ module Infrataster
       context "with vagrant option" do
         context "when vagrant option is true" do
           it 'returns args for SSH.start' do
-            server = Server.new('name', 'address', vagrant: true)
+            server = Server.new('name', '127.0.0.1', vagrant: true)
             expect(server).to receive(:ssh_config_for_vagrant).with('name').
               and_return({host_name: 'host', user: 'user'})
             expect(server.send(:_ssh_start_args)).
@@ -64,7 +64,7 @@ module Infrataster
 
         context "when vagrant option is not true but truthy" do
           it 'returns args for SSH.start' do
-            server = Server.new('name', 'address', vagrant: 'vagrant_vm_name')
+            server = Server.new('name', '127.0.0.1', vagrant: 'vagrant_vm_name')
             expect(server).to receive(:ssh_config_for_vagrant).with('vagrant_vm_name').
               and_return({host_name: 'host', user: 'user'})
             expect(server.send(:_ssh_start_args)).
@@ -75,7 +75,7 @@ module Infrataster
 
       context "otherwise" do
         it 'raises an error' do
-          server = Server.new('name', 'address')
+          server = Server.new('name', '127.0.0.1')
           expect do
             server.send(:_ssh_start_args)
           end.to raise_error(Server::Error)

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: infrataster
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-18 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +150,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- ci/jenkins_build
 - infrataster.gemspec
 - lib/infrataster.rb
 - lib/infrataster/contexts.rb

data/ci/jenkins_build

@@ -1,22 +0,0 @@
-#!/usr/bin/env ruby
-
-def exec(cmd, exit_if_fail = true)
-  env = {'CI' => 'true'}
-  system env, cmd
-  if exit_if_fail && $?.exitstatus != 0
-    puts "`#{cmd}` failed"
-    exit $?.exitstatus
-  end
-
-  $?.exitstatus
-end
-
-exec('env USE_SYSTEM_GECODE=1 bundle install --path=vendor/bundle --jobs=4')
-
-exec 'bundle exec rake spec:unit'
-
-exec 'bundle exec rake spec:integration:prepare'
-status = exec('bundle exec rake spec:integration', false)
-exec 'bundle exec rake spec:integration:clean'
-exit status
-