houcho 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7507d97a03907ede046c497483d4b392050c9cc0
-  data.tar.gz: 1d12b359fbb0b67fc970aeb1ff1039f0873ac9a1
+  metadata.gz: 3dfa40a671511626f2a5665f70339de35d40004c
+  data.tar.gz: 63d63e7aa834a00738aab1d6550b532149dd8100
 SHA512:
-  metadata.gz: f8e6196a85525d9b1ab2c98fb4f8bd040262d35b8d0b34a89bf511d5536fba3f0c7a2636e6c1d25723f5ae3f72566011cefd440e44c8bc97b35e61272551d08f
-  data.tar.gz: bcda04b358bdc47d2e2eb8231a92ae702dfaa45370a48c56cfa08a56a90e059c2253395022e9806a9dab4e29fe3390aea430ea87c31a5077614da3bfd099e459
+  metadata.gz: 20f31de24421b105522f7bc2e089c6d21fc3e96cb6c67649c4321b82cd9baf1b4e9318f42969b0d7a14b9f9571359ea2891212df9d29efe153e12a03ae25ba12
+  data.tar.gz: cb9831aa6687b2a89c3104bda38b65fb58e487e3b815c32772f724a6cb3d6911eb24ae87e2eb451ac2d3659f2ef46404577bf0f43f613acd2562a311b9e43a20

data/README.md

@@ -145,3 +145,5 @@ $ houcho role exec studio3104::www --exclude-hosts studio3104.test
 - write more tests
 - `Houcho::Logger`
   - LTSV
+- yaml -> sqlite ?
+- executable spec from relative path(current directory is any)

data/lib/houcho/element.rb

@@ -11,6 +11,9 @@ module Houcho
 
 
     def attach(elements, roles)
+      elements = [elements] if elements.class == String
+      roles    = [roles]    if roles.class    == String
+
       invalid_roles = []
       roles.each do |role|
         index = Role.index(role)
@@ -29,6 +32,9 @@ module Houcho
 
 
     def detach(elements, roles)
+      elements = [elements] if elements.class == String
+      roles    = [roles]    if roles.class    == String
+
       invalid_roles = []
       roles.each do |role|
         index = Role.index(role)

data/lib/houcho/role.rb

@@ -5,6 +5,7 @@ module Houcho
     module_function
 
     def create(role, exists = [])
+      role   = [role] if role.class == String
       target = role.shift
 
       if self.index(target)
@@ -23,6 +24,7 @@ module Houcho
 
 
     def delete(role, errors = {exists:[], hosts:[], specs:[], cf:[]})
+      role   = [role] if role.class == String
       target = role.shift
       index  = self.index(target)
       del    = true
@@ -117,5 +119,10 @@ module Houcho
     def name(index)
       @roles.data[index]
     end
+
+
+    def exist?(role)
+      ! self.index(role).nil?
+    end
   end
 end

data/lib/houcho/version.rb

@@ -1,3 +1,3 @@
 module Houcho
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/spec/houcho_spec.rb

@@ -8,10 +8,10 @@ describe Houcho do
     Dir.chdir(spectmp)
     init_repo
     Role.create(['studio3104', 'studio3105'])
-    Host.attach(['hostA'], ['studio3104'])
+    Host.attach('hostA', 'studio3104')
 
     File.write('spec/specA_spec.rb',' ')
-    Spec.attach(['specA'], ['studio3104'])
+    Spec.attach('specA', 'studio3104')
 
     File.write('./role/cloudforecast/cf.yaml', <<EOD
 --- #houcho
@@ -24,16 +24,16 @@ servers:
 EOD
     )
     CloudForecast.load_yaml
-    CloudForecast::Role.attach(['houcho::rspec::studio3104'], ['studio3104'])
+    CloudForecast::Role.attach('houcho::rspec::studio3104', 'studio3104')
   end
 
 
   describe Role do
     context 'create and delete a role' do
-      it { Role.create(['www']) }
-      it { expect { Role.create(['www']) }.to raise_error }
-      it { Role.delete(['www']) }
-      it { expect { Role.delete(['web']) }.to raise_error }
+      it { Role.create('www') }
+      it { expect { Role.create('www') }.to raise_error }
+      it { Role.delete('www') }
+      it { expect { Role.delete('web') }.to raise_error }
     end
 
     context 'create and delete two roles' do
@@ -51,7 +51,7 @@ EOD
     end
 
     context 'get all roles' do
-      it { Role.all.should eq ['studio3104', 'studio3105'] }
+      it { expect(Role.all).to eq(['studio3104', 'studio3105']) }
     end
 
     context 'get details of a role' do
@@ -77,9 +77,9 @@ EOD
   describe Houcho::Host do
     context 'attach and detach hosts to roles' do
       it { Host.attach(['host1', 'host2'], ['studio3104', 'studio3105']) }
-      it { expect { Host.attach(['host1'], ['invalid_role']) }.to raise_error }
+      it { expect { Host.attach('host1', 'invalid_role') }.to raise_error }
       it { Host.detach(['host1', 'host2'], ['studio3104', 'studio3105']) }
-      it { expect { Host.detach(['host1'], ['invalid_role']) }.to raise_error }
+      it { expect { Host.detach('host1', 'invalid_role') }.to raise_error }
     end
 
     context 'get details of a host' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: houcho
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Satoshi SUZUKI