niman 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4b4fbde2c69d5428cdeef5956a0781eded47766
-  data.tar.gz: cc99ba94749c533e2d0a953695a4b03ec0aec32e
+  metadata.gz: 77f2ee2cb32e24e29d3e081d50044edd26819fc8
+  data.tar.gz: 5fdb6bbfa078331f80e538a9e0de5fde3d8d831c
 SHA512:
-  metadata.gz: 25581ac834d6daa7134e5ecf6708a22bd5e7e7bc74568325fd3389bafa7f2e9b7d3079115beed68848f69222933c7da194c70903360a24fae1909595e872c0ea
-  data.tar.gz: a98b0c0aa0417876e61c269aa8c203181ea74ae28194a397f6c79593c0d3ff39bf27af2152d170baf9be62378695e01c394ca538fa92211824abd276da2bc7fc
+  metadata.gz: de38665f05cfacb23ac3e7b471b60536c4739c18ab3638c74951e7aeae0111a6dbb9c01fe0a523c9652867edf24ad18248a4a3e798f34a029bc57d83490f3bfb
+  data.tar.gz: bcb6565a2b73e9b14bf005f6f9a2a2fba08749ab6299a9c4cf8c635bd249d8f799c0213dd287a73c9d524acc728ae21b26f31fea3c43bf61239f3d49fda9fc68

data/.travis.yml

@@ -1,10 +1,7 @@
 language: ruby
 rvm:
-- "1.9.3"
 - "2.0.0"
 - "2.1.5"
 - "2.2.0"
-- jruby-19mode # JRuby in 1.9 mode
-- rbx
 env:
-- RUN=rspec
+- RUN=rake

data/README.md

@@ -1,4 +1,5 @@
 # Niman
+[![Build Status](https://travis-ci.org/schultyy/Niman.svg?branch=master)](https://travis-ci.org/schultyy/Niman)
 
 Niman is a proof-of-concept provisioner.
 
@@ -76,6 +77,20 @@ To apply a `Nimanfile` run:
 $ niman apply
 ```
 
+### Use it as a Vagrant plugin
+
+At first, install it as Vagrant plugin:
+```bash
+$ vagrant plugin install niman
+```
+
+Then, in `Vagrantfile`, add this line:
+
+```ruby
+config.vm.provision "niman"
+```
+Save the file and after this you can `vagrant provision`.
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/niman/fork )

data/Rakefile

@@ -1,2 +1,4 @@
 require "bundler/gem_tasks"
-
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+task :default => [:spec]

data/lib/niman/cli/application.rb

@@ -3,6 +3,8 @@ require 'niman/recipe'
 require 'niman/provisioner'
 require "niman/shell"
 require "niman/installer"
+require "niman/exceptions"
+require "niman/filehandler"
 
 module Niman
   module CLI
@@ -15,33 +17,38 @@ module Niman
         @silent = false
       end
 
-      desc "apply", "Applies a Nimanfile"
-      def apply
-        Niman::Recipe.from_file
-        config = Niman::Recipe.configuration
-        installer = Niman::Installer.new(shell: client_shell, managers:{
-          debian: 'apt-get -y',
-          redhat: 'yum -y'
-        })
-        provisioner = Niman::Provisioner.new(installer, config.instructions)
-        this = self
-        provisioner.run do |instruction|
-          this.say "Executing task #{instruction.description}" unless @quiet
+      desc "apply [NIMANFILE]", "Applies a Nimanfile"
+      def apply(file='Nimanfile')
+        begin
+          Niman::Recipe.from_file(file)
+          config = Niman::Recipe.configuration
+          installer = Niman::Installer.new(shell: client_shell, managers:{
+            debian: 'apt-get -y',
+            redhat: 'yum -y'
+          })
+          filehandler = Niman::FileHandler.new(client_shell)
+          provisioner = Niman::Provisioner.new(installer, filehandler, config.instructions)
+          this = self
+          provisioner.run do |instruction|
+            this.say "Executing task #{instruction.description}" unless @quiet
+          end
+        rescue LoadError => e
+          client_shell.print(e.message, :error)
+        rescue Niman::ConfigError => cfg_error
+          client_shell.print(cfg_error.message, :error)
         end
-      rescue LoadError => e
-        error e.message
       end
 
-      desc "setup", "Generates an empty Nimanfile"
-      def setup
+      desc "setup [FILENAME]", "Generates an empty Nimanfile"
+      def setup(filename=Niman::Recipe::DEFAULT_FILENAME)
         content = <<-EOS
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 Niman::Recipe.configure do |config|
 end
         EOS
-        File.open(Niman::Recipe::DEFAULT_FILENAME, "w") { |handle| handle.write(content) }
-        say "Created new file #{Niman::Recipe::DEFAULT_FILENAME}"
+        File.open(filename, "w") { |handle| handle.write(content) }
+        say "Created new file #{filename}"
       end
     end
   end

data/lib/niman/filehandler.rb

@@ -0,0 +1,15 @@
+module Niman
+  class FileHandler
+    attr_reader :shell
+
+    def initialize(shell)
+      @shell = shell
+    end
+
+    def run(files)
+      Array(files).each do |file|
+        shell.create_file(file.path, file.content)
+      end
+    end
+  end
+end

data/lib/niman/library/file.rb

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

data/lib/niman/library/package.rb

@@ -13,6 +13,10 @@ module Niman
       def valid?
         !name.empty?
       end
+
+      def errors
+        'package name must not be empty'
+      end
     end
   end
 end

data/lib/niman/provisioner.rb

@@ -4,8 +4,9 @@ module Niman
   class Provisioner
     attr_reader :instructions
 
-    def initialize(installer, instructions)
+    def initialize(installer, filehandler, instructions)
       @installer    = installer
+      @filehandler  = filehandler
       @instructions = Array(instructions)
     end
 
@@ -13,12 +14,16 @@ module Niman
       @instructions.all?(&:valid?)
     end
 
+    def errors
+      @instructions.map(&:errors).flatten.join("\n")
+    end
+
     def run
-      raise Niman::ConfigError unless self.valid?
+      raise Niman::ConfigError, self.errors unless self.valid?
       @instructions.each do |instruction|
         yield(instruction) if block_given?
         if instruction.respond_to?(:run)
-          instruction.run
+          @filehandler.run(instruction)
         else
           @installer.install(instruction)
         end

data/lib/niman/recipe.rb

@@ -16,13 +16,12 @@ module Niman
       @configuration
     end
 
-    def self.reset!
+    def self.reset
       @configuration = Niman::Nimanfile.new
     end
 
-    def self.from_file
-      path = File.join(Dir.pwd, DEFAULT_FILENAME)
-      load DEFAULT_FILENAME
+    def self.from_file(filename)
+      load filename
     end
   end
 end

data/lib/niman/shell.rb

@@ -23,5 +23,20 @@ module Niman
         `#{command}`
       end
     end
+
+    def print(message, type)
+      case type
+      when :error
+        STDERR.puts message
+      else
+        STDOUT.puts message
+      end
+    end
+
+    def create_file(path, content)
+      File.open(File.expand_path(path), 'w') do |handle|
+        handle.write(content)
+      end
+    end
   end
 end

data/lib/niman/vagrant/shell.rb

@@ -9,9 +9,7 @@ module VagrantPlugins
     def os
       if @platform.linux?
         variant = @platform.linux_variant(-> (fn){ @machine.communicate.test("cat #{fn}")}, 
-                                -> (fn){ @channel.execute("cat #{fn}") do |type, data|
-                                           data.chomp
-                                         end})
+                                          -> (fn){ @channel.execute("cat #{fn}") { |type, data| data.chomp}})
         variant[:family]
       else
         raise Niman::UnsupportedOSError
@@ -35,6 +33,28 @@ module VagrantPlugins
       end
     end
 
+    def print(message, type)
+      case type
+      when :error
+        @machine.ui.error(message, {:color => :red})
+      else
+        @machine.ui.info(message, {:color => :green})
+      end
+    end
+
+    def create_file(path, content)
+      @channel.sudo(`echo #{content} > #{File.expand_path(path)}`) do |type, data|
+        #Output the data with the proper color based on the stream.
+        color = type == :stdout ? :green : :red
+        # Clear out the newline since we add one
+        data = data.chomp
+        next if data.empty?
+        options = {}
+        options[:color] = :green
+        @machine.ui.info(data.chomp, options)
+      end
+    end
+
     private
 
     def ruby_platform

data/lib/niman/version.rb

@@ -1,3 +1,3 @@
 module Niman
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/lib/filehandler_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+require 'niman/filehandler'
+require 'niman/shell'
+
+describe Niman::FileHandler do
+  let(:file1) { Niman::Library::File.new(path: '~/foo.txt', content: 'bar') }
+  let(:file2) { Niman::Library::File.new(path: '~/bar.txt', content: 'baz') }
+  let(:files) { [file1, file2] }
+  let(:shell) { double(Niman::Shell) }
+  subject(:filehandler) { Niman::FileHandler.new(shell) }
+
+  describe "#initialize" do
+    it 'accepts a shell' do
+      expect(filehandler.shell).to eq shell
+    end
+  end
+
+  describe '#run' do
+    before do
+      allow(shell).to receive(:create_file)
+    end
+
+    context 'with multiple files' do
+      before do
+        filehandler.run(files)
+      end
+
+      it 'writes files' do
+        expect(shell).to have_received(:create_file).twice
+      end
+    end
+
+    context 'with single file' do
+      before do
+        filehandler.run(file1)
+      end
+
+      it 'writes file' do
+        expect(shell).to have_received(:create_file).once
+      end
+    end
+  end
+end

data/spec/lib/provisioner_spec.rb

@@ -8,7 +8,8 @@ describe Niman::Provisioner do
   let(:vim_package)  { Niman::Library::Package.new(name: 'vim') }
   let(:instructions) { [file, vim_package] }
   let(:installer)    { double(Niman::Installer) }
-  subject(:provisioner) { Niman::Provisioner.new(installer, instructions) }
+  let(:filehandler)  { double(Niman::FileHandler) }
+  subject(:provisioner) { Niman::Provisioner.new(installer, filehandler, instructions) }
 
   describe "#initialize" do
     it 'accepts a list of instructions' do
@@ -16,7 +17,7 @@ describe Niman::Provisioner do
     end
 
     it 'accepts a single instruction' do
-      provisioner = Niman::Provisioner.new(installer, file)
+      provisioner = Niman::Provisioner.new(installer, filehandler, file)
       expect(provisioner.instructions).to eq [file]
     end
   end
@@ -47,13 +48,13 @@ describe Niman::Provisioner do
 
     context 'with valid instructions' do
       before do
-        allow(file).to receive(:run)
+        allow(filehandler).to receive(:run)
         allow(installer).to receive(:install)
         provisioner.run
       end
 
-      it 'calls run for runable instructions' do
-        expect(file).to have_received(:run)
+      it 'calls file handler for files' do
+        expect(filehandler).to have_received(:run).with(file)
       end
 
       it 'calls installer for package' do

data/spec/lib/recipe_spec.rb

@@ -25,7 +25,7 @@ describe Niman::Recipe do
           file.content = 'hello from alice'
         end
       end
-      Niman::Recipe.reset!
+      Niman::Recipe.reset
     end
 
     it 'erases current configuration' do
@@ -45,14 +45,21 @@ describe Niman::Recipe do
       end
       EOS
       File.open(Niman::Recipe::DEFAULT_FILENAME, "w") {|handle| handle.write(content) }
+      File.open('CustomNimanfile', "w") {|handle| handle.write(content) }
     end
     after do
       File.delete(Niman::Recipe::DEFAULT_FILENAME)
       FakeFS.activate!
+      Niman::Recipe.reset
     end
 
-    it 'loads "Nimanfile" by default' do
-      Niman::Recipe.from_file
+    it 'loads "Nimanfile"' do
+      Niman::Recipe.from_file(Niman::Recipe::DEFAULT_FILENAME)
+      expect(Niman::Recipe.configuration.instructions.length).to eq 1
+    end
+
+    it 'loads Nimanfile from custom path' do
+      Niman::Recipe.from_file('CustomNimanfile')
       expect(Niman::Recipe.configuration.instructions.length).to eq 1
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: niman
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jan Schulte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-08 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -113,6 +113,7 @@ files:
 - lib/niman.rb
 - lib/niman/cli/application.rb
 - lib/niman/exceptions.rb
+- lib/niman/filehandler.rb
 - lib/niman/installer.rb
 - lib/niman/library/file.rb
 - lib/niman/library/package.rb
@@ -126,6 +127,7 @@ files:
 - lib/niman/vagrant/shell.rb
 - lib/niman/version.rb
 - niman.gemspec
+- spec/lib/filehandler_spec.rb
 - spec/lib/installer_spec.rb
 - spec/lib/library/file_spec.rb
 - spec/lib/library/package_spec.rb
@@ -158,6 +160,7 @@ signing_key:
 specification_version: 4
 summary: Provisions your machine
 test_files:
+- spec/lib/filehandler_spec.rb
 - spec/lib/installer_spec.rb
 - spec/lib/library/file_spec.rb
 - spec/lib/library/package_spec.rb