niman 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cec92b45c738e4089f9d9dd278f4c6f84b86e161
-  data.tar.gz: bbbfe3217ab77454b7339aefc5826bf4b5443c91
+  metadata.gz: 849ea0f664574300027e1f5311e06375aa50c001
+  data.tar.gz: 168af32a5c49219b57cb82db211f460aca5de1aa
 SHA512:
-  metadata.gz: 7233e582d4389918020a9ffb1a6ba067841c1d0101bc6fc562f8d1d55fb473786b0bf88617b1294cb124401591d6b0c78575e31e0e6fd4b2b9e41d574de962db
-  data.tar.gz: 9c5a3030863723f7df305f0c26dc390af35c6f59f53af716b906585d8f0eebcc0db1f11fb58e9e3faa5ecf7036e36f64dca26eeb742c255373922ad5febfb829
+  metadata.gz: 4c5fb35e3062723dd50c80e99944f59bd35267d6266b66a24c7141fe678e639b60133a1a4825bafb4061982bc1e328847c1bcf10d021eceea3549b75b9d0981f
+  data.tar.gz: ec6b81a0f7bcd8c1be3e3d907ed237dc06c76a3064228bd3b3de93364d50698372fe56878a849fc77c4d99acd6dd7908f5f654c4e43a5b6e2e3772eb2168b6e4

data/README.md

@@ -73,12 +73,14 @@ Package description:
 ```ruby
 #packages/ruby.rb
 require 'niman'
-class RubyPackage < Niman::Package
+class RubyPackage < Niman::CustomPackage
   package_name :ubuntu, "ruby1.9.1"
   package_name :centos, "ruby1.9.1"
 end
 ```
+
 In your `Nimanfile`:
+
 ```ruby
 Niman::Recipe.configure do |config|
   config.package "packages/ruby"
@@ -89,7 +91,7 @@ A custom package can have one or more configuration files inside of it:
 
 ```ruby
 #packages/nginx
-class NginxPackage < Niman::Package
+class NginxPackage < Niman::CustomPackage
   package_name :ubuntu, 'nginx'
   
   file '/etc/nginx/nginx.conf' do |config|
@@ -103,6 +105,18 @@ class NginxPackage < Niman::Package
 end
 ```
 
+A custom package can also be used as a container for a bunch of configuration files
+and shell commands without the need to specify `package_names`:
+
+```ruby
+#packages/ruby
+require 'niman'
+class RubyPackage < Niman::Library::CustomPackage
+  exec '\\curl -sSL https://get.rvm.io | bash -s stable'
+  exec 'rvm install ruby --latest'
+end
+```
+
 ### Apply `Nimanfile`
 
 To apply a `Nimanfile` run:

data/lib/niman/installer.rb

@@ -17,6 +17,7 @@ module Niman
 
     def install_package(package)
       package_manager = managers.fetch(shell.os.to_sym) { raise Niman::InstallError, shell.os }
+      return unless package.installable?
       if package.respond_to?(:package_names)
         package_name = package.package_names.fetch(shell.os.to_sym) { raise Niman::InstallError, "Package has no support for #{shell.os}" }
         shell.exec("#{package_manager} install #{package_name}", true)

data/lib/niman/library/custom_package.rb

@@ -5,9 +5,15 @@ module Niman
         attr_reader :package_names, :files, :commands
 
         def valid?
-          !package_names.nil? &&
-          !package_names.empty? &&
-          package_names.keys.all?{|k| !package_names[k].empty?}
+          if installable?
+            package_names.keys.all?{|k| !package_names[k].empty?}
+          else
+            true
+          end
+        end
+
+        def installable?
+          !package_names.nil? && !package_names.empty?
         end
 
         def package_name(os, name)

data/lib/niman/library/file.rb

@@ -16,10 +16,6 @@ module Niman
         ['file path must not be nil and empty']
       end
 
-      def run
-        ::File.open(::File.expand_path(path), "w") { |handle| handle.write(content) }
-      end
-
       def description
         "File #{path}"
       end

data/lib/niman/library/package.rb

@@ -18,6 +18,10 @@ module Niman
       def errors
         'package name must not be empty'
       end
+
+      def installable?
+        true
+      end
     end
   end
 end

data/lib/niman/provisioner.rb

@@ -23,31 +23,37 @@ module Niman
       raise Niman::ConfigError, self.errors unless self.valid?
       @instructions.each do |instruction|
         yield(instruction) if block_given?
-        if instruction.respond_to?(:files)
-          custom_package_files(instruction)
-        end
-        if instruction.respond_to?(:commands)
-          custom_package_exec(instruction)
-        end
-        if instruction.respond_to?(:run)
+        if is_file(instruction)
           @filehandler.run(instruction)
         elsif instruction.respond_to?(:command)
           command(instruction)
         else
           @installer.install(instruction)
         end
+
+        if instruction.respond_to?(:files)
+          custom_package_files(instruction)
+        end
+        if instruction.respond_to?(:commands)
+          custom_package_exec(instruction)
+        end
       end
     end
 
     private
 
+    def is_file(instruction)
+      instruction.respond_to?(:path) && 
+        instruction.respond_to?(:content)
+    end
+
     def custom_package_exec(instruction)
       return if instruction.commands.nil?
       instruction.commands.each { |cmd| command(cmd) }
     end
 
     def custom_package_files(instruction)
-      instruction.files.each do |file|
+      Array(instruction.files).each do |file|
         @filehandler.run(file)
       end
     end

data/lib/niman/version.rb

@@ -1,3 +1,3 @@
 module Niman
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/lib/application_spec.rb

@@ -109,6 +109,17 @@ describe Niman::CLI::Application do
   end
 
   describe "custom package" do
+    def create_package(name, content, filename)
+      nginx_package = <<-EOS
+          require 'niman'
+
+          class #{name} < Niman::Library::CustomPackage
+            #{content}
+          end
+      EOS
+      FileUtils.mkdir("packages")
+      File.open(filename, "w") {|h| h.write(nginx_package)}
+    end
     context 'is nonexistant' do
       before do
         nimanfile = <<-EOS
@@ -131,9 +142,6 @@ describe Niman::CLI::Application do
     context 'is existant' do
       before do
         nginx_package = <<-EOS
-          require 'niman'
-
-          class Nginx < Niman::Library::CustomPackage
             package_name :debian, 'nginx'
 
             file '/etc/nginx/nginx.conf' do |config|
@@ -142,19 +150,17 @@ describe Niman::CLI::Application do
 
             exec :sudo, 'ln -s /etc/nginx/sites-available/example.org /etc/nginx/sites-enabled/example.org'
             exec 'touch ~/install_notes.txt'
-          end
         EOS
 
         nimanfile = <<-EOS
-      #-*- mode: ruby -*-
-      # vi: set ft=ruby :
-      require 'niman'
-      Niman::Recipe.configure do |config|
-        config.package "packages/nginx" 
-      end
+          #-*- mode: ruby -*-
+          # vi: set ft=ruby :
+          require 'niman'
+          Niman::Recipe.configure do |config|
+            config.package "packages/nginx" 
+          end
         EOS
-        FileUtils.mkdir("packages")
-        File.open("packages/nginx.rb", "w") {|h| h.write(nginx_package)}
+        create_package('Nginx', nginx_package, "packages/nginx.rb")
         File.open(Niman::Recipe::DEFAULT_FILENAME, "w") {|h| h.write(nimanfile)}
         allow(shell).to receive(:create_file)
         allow(shell).to receive(:exec)
@@ -179,6 +185,51 @@ describe Niman::CLI::Application do
       it 'creates install_notes.txt in home directory' do
         expect(shell).to have_received(:exec).with('touch ~/install_notes.txt', false)
       end
+
+      it 'installs package before creating configuration' do
+        expect(shell).to have_received(:exec).with("apt-get -y install nginx", true).ordered
+        expect(shell).to have_received(:create_file).with('/etc/nginx/nginx.conf', 'foo bar').ordered
+        expect(shell).to have_received(:exec).with('ln -s /etc/nginx/sites-available/example.org /etc/nginx/sites-enabled/example.org', true).ordered
+      end
+    end
+
+    context 'without package_name' do
+      before do
+        custom_ruby_package = <<-EOS
+          exec '\\curl -sSL https://get.rvm.io | bash -s stable'
+          exec 'rvm install ruby --latest'
+        EOS
+        
+        nimanfile = <<-EOS
+          #-*- mode: ruby -*-
+          # vi: set ft=ruby :
+          require 'niman'
+          Niman::Recipe.configure do |config|
+            config.package "packages/ruby"
+          end
+        EOS
+
+        create_package('Ruby', custom_ruby_package, 'packages/ruby.rb')
+        File.open(Niman::Recipe::DEFAULT_FILENAME, "w") {|h| h.write(nimanfile)}
+        allow(shell).to receive(:create_file)
+        allow(shell).to receive(:exec)
+        application.apply
+      end
+      after do
+        FileUtils.rm_r("packages")
+      end
+
+      it 'does not execute package manager commands' do
+        expect(shell).to_not have_received(:exec).with('apt get -y install')
+      end
+
+      it 'executes curl command' do
+        expect(shell).to have_received(:exec).with('\curl -sSL https://get.rvm.io | bash -s stable', false)
+      end
+
+      it 'installs latest ruby' do
+        expect(shell).to have_received(:exec).with('rvm install ruby --latest',false)
+      end
     end
   end
 end

data/spec/lib/library/custom_package_spec.rb

@@ -27,10 +27,6 @@ describe Niman::Library::CustomPackage do
       package.instance_variable_set(:@package_names, {})
     end
 
-    it 'is not valid when package_names not set' do
-      expect(package.valid?).to be false
-    end
-
     it 'is not valid when package name is empty' do
       package.package_name :ubuntu, ''
       expect(package.valid?).to be false

data/spec/lib/library/file_spec.rb

@@ -50,26 +50,6 @@ describe Niman::Library::File do
     end
   end
 
-  describe "#run" do
-    let(:path) { 'hello.txt' }
-    let(:content) { 'FooBar' }
-    subject(:file) { Niman::Library::File.new(path: path, content: content) }
-    before do
-      file.run
-    end
-    after do
-      File.delete(path)
-    end
-
-    it 'creates a file at path' do
-      expect(File.exists?(path)).to be true
-    end
-
-    it 'file has expected content' do
-      expect(File.read(path)).to eq content
-    end
-  end
-
   describe "#description" do
     let(:path) { 'hello.txt' }
     subject(:file) { Niman::Library::File.new(path: path) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: niman
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Jan Schulte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-21 00:00:00.000000000 Z
+date: 2015-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor