syllabus 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4012747bcc3f4369b0a20f30051bbc5bf226346
-  data.tar.gz: 755672d82968498ce8d5d4fefd0b5b3b84d8db4e
+  metadata.gz: f5b5883a98d5bf257cfcad935a27669565efde0e
+  data.tar.gz: 5baf224cc77f0319f1aca69dcc96d11d1443e19c
 SHA512:
-  metadata.gz: adab2311b152819ccfb88ac76cbe4521a484b5276f1e5260ec0016ab0dcd5e135945002e59e694e10913a7b05f3ff072c8f1521a5962f67fdd2555d0df717e94
-  data.tar.gz: 84bb6879c1f1c27e33033bb9ac344eb54ff354b310afa354bbcd541c98b7de217762dcb06f61f9bb70606d34a848c30a7c91b015967faf9553e5c506b17db0ea
+  metadata.gz: 6144c146067206f896b080e52cdedec6e23db8e60a4a25157958a8971e6d220b3b65d5b21f4141490c8b93a1ff9fcb745dfd8a6b7914e01778958bdb7b1e9ef2
+  data.tar.gz: 3c5130a794977a9f9b4aca4a89778aa17ce0cbdc944bc541a605a0deffcad852eb1f7f6b9ce84db78daa7d4bb3ed65d2000fefdd5d8cf65cb3ec3066eece64f0

data/README.md

@@ -1,4 +1,4 @@
-# Syllabus [![BuildStatus](https://travis-ci.org/kentaro/syllabus.png)](http://travis-ci.org/kentaro/syllabus)
+# Syllabus [![BuildStatus](https://travis-ci.org/serverspec/syllabus.png)](http://travis-ci.org/serverspec/syllabus)
 
 Syllabus is a configuration management tool for the era of "immutable infrastructure." which just provides a thin abstraction layer onto plain shell script.
 

data/examples/mac.rb

@@ -1,4 +1,3 @@
-os_type 'Darwin'
 hosts   %w[localhost]
 path    ENV['PATH']
 install 'git'

data/lib/syllabus.rb

@@ -2,15 +2,6 @@ module Syllabus
   require 'syllabus/version'
   require 'syllabus/cli'
   require 'syllabus/core'
-  require 'syllabus/logger'
   require 'syllabus/config'
-  require 'syllabus/backend'
-  require 'syllabus/command'
-  require 'syllabus/command/base'
-  require 'syllabus/command/darwin'
-  require 'syllabus/command/linux'
-  require 'syllabus/command/redhat'
+  require 'syllabus/logger'
 end
-
-require 'specinfra'
-

data/lib/syllabus/config.rb

@@ -1,16 +1,16 @@
 class Syllabus::Config
   attr_reader :commands
 
-  def self.new_from_file(file)
-    configuration = File.read(file)
-    new(configuration, file)
+  def self.new_from_file(args)
+    config = File.read(args[:file])
+    new(config: config, file: args[:file], backend: args[:backend])
   end
 
-  def initialize(configuration, file = '')
+  def initialize(args)
+    @backend  = args[:backend]
     @hosts    = nil
-    @os_type  = nil
     @commands = []
-    instance_eval(configuration, file)
+    instance_eval(args[:config], args[:file] || '')
   end
 
   def hosts(arg = nil)
@@ -21,29 +21,16 @@ class Syllabus::Config
     @hosts
   end
 
-  def os_type(arg = nil)
-    if arg
-      @os_type = arg.kind_of?(Proc) ? arg.call : arg
-    end
-
-    @os_type
-  end
-
   def path(arg = nil)
     if arg
-      @path = arg.kind_of?(Proc) ? arg.call : arg
-      SpecInfra::Configuration.path = @path
+      @path = arg.kind_of?(Array) ? arg : arg.split(':')
     end
 
     @path
   end
 
   def method_missing(name, *args)
-    command = Syllabus::Command.new(
-      os_type: os_type,
-      name:    name,
-      args:    args,
-    )
+    command = @backend.commands.send(name, *args)
     @commands.push(command)
   end
 end

data/lib/syllabus/core.rb

@@ -1,11 +1,16 @@
+require 'specinfra'
+
 class Syllabus::Core
+  extend SpecInfra::Helper::Backend
+  extend SpecInfra::Helper::DetectOS
+
   def self.run(args)
-    config  = Syllabus::Config.new_from_file(args[:file])
-    backend = Syllabus::Backend.new(type: args[:type])
+    backend = backend_for(args[:type])
+    config  = Syllabus::Config.new_from_file(file: args[:file], backend: backend)
     logger  = Syllabus::Logger.new(level: args[:level])
 
     config.commands.each do |command|
-      result = backend.run_command(command.to_s)
+      result = backend.run_command(command)
       logger.log(command, result)
     end
   end

data/lib/syllabus/version.rb

@@ -1,3 +1,3 @@
 module Syllabus
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/lib/syllabus/config_spec.rb

@@ -1,6 +1,13 @@
 require 'spec_helper'
 
 describe Syllabus::Config do
+  let(:backend) {
+    backend  = SpecInfra::Backend.backend_for('Exec')
+    commands = SpecInfra::Command::RedHat.new
+    backend.set_commands(commands)
+    backend
+  }
+
   describe '#hosts' do
     context 'Hosts are passed as an Array' do
       let(:config) {
@@ -9,7 +16,7 @@ hosts %w[foo bar baz]
 EOS
       }
       subject {
-        described_class.new(config)
+        described_class.new(backend: backend, config: config)
       }
 
       it { expect(subject.hosts).to be == %w[foo bar baz] }
@@ -22,38 +29,38 @@ hosts -> { %w[foo bar baz] }
 EOS
       }
       subject {
-        described_class.new(config)
+        described_class.new(backend: backend, config: config)
       }
 
       it { expect(subject.hosts).to be == %w[foo bar baz] }
     end
   end
 
-  describe '#os_type' do
-    context 'os_type are passed as a String' do
+  describe '#path' do
+    context 'path are passed as an Array' do
       let(:config) {
         <<EOS
-os_type 'RedHat'
+path %w[/bin /usr/bin]
 EOS
       }
       subject {
-        described_class.new(config)
+        described_class.new(backend: backend, config: config)
       }
 
-      it { expect(subject.os_type).to be == 'RedHat' }
+      it { expect(subject.path).to be == %w[/bin /usr/bin] }
     end
 
-    context 'os_type are passed as a Proc' do
+    context 'path are passed as a String' do
       let(:config) {
         <<EOS
-os_type -> { 'RedHat' }
+path '/bin:/usr/bin'
 EOS
       }
       subject {
-        described_class.new(config)
+        described_class.new(backend: backend, config: config)
       }
 
-      it { expect(subject.os_type).to be == 'RedHat' }
+      it { expect(subject.path).to be == %w[/bin /usr/bin] }
     end
   end
 
@@ -64,12 +71,12 @@ install 'httpd'
 EOS
     }
     subject {
-      described_class.new(config)
+      described_class.new(backend: backend, config: config)
     }
 
     it {
       expect(subject.commands.length).to be == 1
-      expect(subject.commands.first).to  be_an_instance_of Syllabus::Command
+      expect(subject.commands.first).to  be_an_instance_of String
     }
   end
 end

data/syllabus.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'specinfra'
-  spec.add_dependency 'configspec'
   spec.add_dependency 'thor'
   spec.add_dependency 'term-ansicolor'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syllabus
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Kentaro Kuribayashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: specinfra
@@ -24,20 +24,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: configspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +80,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: 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'
 description: Yet Another Configuration Management Tool in the Era of Immutable Infrastructure
 email:
 - kentarok@gmail.com
@@ -111,19 +111,11 @@ files:
 - bin/syllabus
 - examples/mac.rb
 - lib/syllabus.rb
-- lib/syllabus/backend.rb
 - lib/syllabus/cli.rb
-- lib/syllabus/command.rb
-- lib/syllabus/command/base.rb
-- lib/syllabus/command/darwin.rb
-- lib/syllabus/command/linux.rb
-- lib/syllabus/command/redhat.rb
 - lib/syllabus/config.rb
 - lib/syllabus/core.rb
 - lib/syllabus/logger.rb
 - lib/syllabus/version.rb
-- spec/lib/syllabus/backend_spec.rb
-- spec/lib/syllabus/command_spec.rb
 - spec/lib/syllabus/config_spec.rb
 - spec/spec_helper.rb
 - syllabus.gemspec
@@ -152,7 +144,5 @@ signing_key:
 specification_version: 4
 summary: Yet Another Configuration Management Tool in the Era of Immutable Infrastructure
 test_files:
-- spec/lib/syllabus/backend_spec.rb
-- spec/lib/syllabus/command_spec.rb
 - spec/lib/syllabus/config_spec.rb
 - spec/spec_helper.rb

data/lib/syllabus/backend.rb

@@ -1,25 +0,0 @@
-require 'delegate'
-require 'specinfra/backend'
-
-class Syllabus::Backend < Delegator
-  attr_reader :backend_type
-
-  class NotImplementedError < StandardError; end
-
-  def initialize(args)
-    @backend_type = args[:type]
-    @backend      = backend_class.instance
-  end
-
-  def backend_class
-    if SpecInfra::Backend.const_defined?(backend_type.to_sym)
-      SpecInfra::Backend.const_get(backend_type.to_sym)
-    else
-      raise NotImplementedError.new("Backend for #{backend_type} has not been implemented yet")
-    end
-  end
-
-  def __getobj__
-    @backend
-  end
-end

data/lib/syllabus/command.rb

@@ -1,28 +0,0 @@
-require 'configspec/commands/base'
-require 'configspec/commands/linux'
-require 'configspec/commands/redhat'
-
-class Syllabus::Command
-  attr_reader :os_type, :name, :args
-
-  class NotImplementedError < StandardError; end
-
-  def initialize(args)
-    @os_type = args[:os_type]
-    @name    = args[:name]
-    @args    = args[:args]
-  end
-
-  def command_class
-    if Syllabus::Command.const_defined?(os_type.to_sym)
-      Syllabus::Command.const_get(os_type.to_sym)
-    else
-      raise NotImplementedError.new("Command for #{os_type} has not been implemented yet")
-    end
-  end
-
-  def to_s
-    command = command_class.new
-    command.send(name.to_sym, args.first)
-  end
-end

data/lib/syllabus/command/base.rb

@@ -1,2 +0,0 @@
-class Syllabus::Command::Base < Configspec::Commands::Base
-end

data/lib/syllabus/command/darwin.rb

@@ -1,5 +0,0 @@
-class Syllabus::Command::Darwin < Configspec::Commands::Base
-  def install(package)
-    cmd = "brew install '#{package}'"
-  end
-end

data/lib/syllabus/command/linux.rb

@@ -1,2 +0,0 @@
-class Syllabus::Command::Linux < Configspec::Commands::Linux
-end

data/lib/syllabus/command/redhat.rb

@@ -1,2 +0,0 @@
-class Syllabus::Command::RedHat < Configspec::Commands::RedHat
-end

data/spec/lib/syllabus/backend_spec.rb

@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe Syllabus::Backend do
-  describe '#backend_class' do
-    context 'when a backend class found' do
-      subject {
-        Syllabus::Backend.new(type: 'Exec')
-      }
-
-      it { expect(subject.backend_class).to be == SpecInfra::Backend::Exec }
-    end
-
-    context 'when no command class found' do
-      subject {
-        Syllabus::Backend.new(type: 'NoSuchType')
-      }
-
-      it {
-        expect { subject.backend_class }.to raise_error Syllabus::Backend::NotImplementedError
-      }
-    end
-  end
-end

data/spec/lib/syllabus/command_spec.rb

@@ -1,59 +0,0 @@
-require 'spec_helper'
-
-describe Syllabus::Command do
-  describe '#command_class' do
-    context 'when a command class found' do
-      subject {
-        Syllabus::Command.new(
-          os_type: 'RedHat',
-          name:    :install,
-          args:    %w['httpd'],
-        )
-      }
-
-      it { expect(subject.command_class).to be == Syllabus::Command::RedHat }
-    end
-
-    context 'when no command class found' do
-      subject {
-        Syllabus::Command.new(
-          os_type: 'NoSuchType',
-          name:    :install,
-          args:    %w['httpd'],
-        )
-      }
-
-      it {
-        expect { subject.command_class }.to raise_error Syllabus::Command::NotImplementedError
-      }
-    end
-  end
-
-  describe '#to_s' do
-    context 'when a command class found' do
-      subject {
-        Syllabus::Command.new(
-          os_type: 'RedHat',
-          name:    :install,
-          args:    %w['httpd'],
-        )
-      }
-
-      it { expect(subject.to_s).to be == "yum -y install 'httpd'" }
-    end
-
-    context 'when no command class found' do
-      subject {
-        Syllabus::Command.new(
-          os_type: 'NoSuchType',
-          name:    :install,
-          args:    %w['httpd'],
-        )
-      }
-
-      it {
-        expect { subject.to_s }.to raise_error Syllabus::Command::NotImplementedError
-      }
-    end
-  end
-end