vito 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24b73b5ceaa70f360c97d0bb28e4d2ca8a9d8e1d
-  data.tar.gz: 2759c1d3f37d0994c6b1b271d9093a7e93db92c1
+  metadata.gz: 7d83a7c54cd196082aa7cee76c2b43a667dd93ff
+  data.tar.gz: ecb8a858cc24e108664b2d71cad82cdb514538dc
 SHA512:
-  metadata.gz: 5fea002c81b1e578fcd42a913f594211a32d5414964d746f0af45a2d147b45f54445979d0a8c7f119debee9bacfbbd16a6831a03d19564c622916ef6ddfd3c10
-  data.tar.gz: 88ba9d0cc04185a0983bf31c76859ad9a3509b0570d0cb08e2e6d055b2ab145928cb2cce91b26d8d18409776176e635f7ab54117a1ea43d1e3f518545623c77f
+  metadata.gz: da51eb3cafad2a92bd204b84ed4eb75e61da05c5373ff383a2a56eaa92ffe506f3a6578f59041f12f4888d2667e1d0bf320bc187e1d82f2cf45dabc5e55600b2
+  data.tar.gz: 5cfde7e8e97ec03a7a199cb942df1edb3d69d697a194f3e83ca97c55bd14b8c4e684233105afa63ff08ecbb85818a45223f6ef1de8a45ac6ee4c06a9565e4c7b

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+script: "bundle exec rake spec:unit"
+notifications:
+  email: false
+rvm:
+  - 2.0.0
+  - 1.9.3
+  - ruby-head
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/README.md

@@ -4,27 +4,28 @@ Vito installs webservers for you very easily. Its goal is to be opinionated,
 with a shallow learning curve needed due to the use of a Gemfile-like specification
 file.
 
+[![Build Status](https://travis-ci.org/kurko/vito.png?branch=master)](https://travis-ci.org/kurko/vito)
+
 ```ruby
 server :linode do
-  connection :ssh, :command => "vagrant ssh -c" }
+  connection :ssh, :command => "ssh deploy@your_server_com"
 
   install :rbenv
   install :git
   install :ruby, version: "2.0.0-p195"
-  install :tmux
   install :apache do
-    vhosts_for :rails, port: 80
-    vhosts_for :rails, port: 443
+    # install vhosts for port 80 and 443
+    vhosts with: :ssl, path: "/var/projects"
+    with :passenger
   end
-  install :passenger, with: :apache
+
+  install :tmux
 end
 
 server :ec2 do
-  install :postgres do
-    allow_connection from: :linode
-  end
-
   # ...
+
+  install :postgres, username: 'vito', password: 'corleone'
 end
 ```
 
@@ -33,15 +34,20 @@ about a particular server.
 
 For now, it won't be hosted, just sending SSH messages instead.
 
-## Working packages
+## Usage
 
-These are the packages that are currently working:
+Vito is unstable and we do not advise using this on production yet. Let us do
+more tests first.
 
-rbenv, git, ruby, postgres
+## Working packages
 
-## Usage
+These are the packages that are currently working:
 
-Vito currently works only in development.
+* Rbenv
+* Git
+* Ruby
+* PostgreSQL
+* Apache (including Passenger)
 
 ## Documentation
 
@@ -49,21 +55,28 @@ Vito currently works only in development.
 
 ## Contributing
 
-Integration tests are run with Vagrant, you have to install it first. **Important**:
+Integration tests are run with Vagrant, so please install it first. **Important**:
 don't use the gem, but the newer packaged installation. In fact, you should
 uninstall it (removing binstubs even) or Bundler will start complaining.
 
+#### Vagrant test boxes
+
+We have acceptance test for different operating systems (e.g Ubuntu, CentOS etc).
 Once you clone the repo, run:
 
 ```bash
-$ rake setup:download_vagrant_box
+$ bundle exec rake setup:download_vagrant_box
 ```
 
-This will download a VirtualBox image, initialize it with Vagrant and take a
-initial snapshot. Whenever you run a spec, we'll roll back to this snapshot
+This will download VirtualBox images in `spec/vagrant_boxes/` automatically if
+they're not present, initialize them with Vagrant and take a initial snapshot.
+Whenever you run a spec, we'll roll back to this snapshot
 to test it in a clean slate.
 
-Add recipes to the `recipes/` dir. You can base your recipe on the existing ones.
+Each box has around 400Mb in size, so make sure you have enough space. For a list
+of to-be-downloaded boxes, see the `Rakefile`.
+
+Add recipes to the `recipes/` dir. You can just clone the existing ones.
 
 Also, take a look at the rake tasks for running specs, e.g `rake spec:unit`,
 `rake spec:acceptance`, `rake spec:all` etc

data/Rakefile

@@ -1,30 +1,13 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
-
-def take_snapshot(name = "vito_snapshot")
-  puts "Installing vagrant-vbox-snapshot to take a snapshot"
-  system "vagrant plugin install vagrant-vbox-snapshot"
-
-  puts "Taking a snapshot of the current vm state"
-  system "vagrant snapshot take #{name}"
-end
+require "vito/tasks/vagrant_bootstrap"
 
 desc "Sets up a Vagrant box for running specs"
 namespace :setup do
   task :download_vagrant_box do
     # list of boxes http://www.vagrantbox.es/
-    puts "Downloading Vagrant box called ubuntu_spec_box"
-    system "vagrant box add ubuntu_spec_box http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box"
-    puts "Initializing box with Vagrant"
-    system "vagrant init ubuntu_spec_box"
-    take_snapshot("initial_box")
-  end
-end
-
-namespace :vagrant do
-  desc "Creates a snapshot of the current box state to be used in specs"
-  task :take_snapshot do
-    take_snapshot("initial_box")
+    Vito::Tasks::VagrantBootstrap.new(:ubuntu10).install
+    Vito::Tasks::VagrantBootstrap.new(:ubuntu12).install
   end
 end
 
@@ -36,12 +19,14 @@ namespace :spec do
   task :acceptance do
     puts "Running spec using Vagrant boxes (this could take several minutes)"
     system "bundle exec rspec spec/acceptance"
+    fail if $?.exitstatus > 0
   end
 
   desc "Runs unit specs (no Vagrant box required)"
   task :unit do
     puts "Running unit specs"
     system "bundle exec rspec spec/vito"
+    fail if $?.exitstatus > 0
   end
 end
 

data/bin/vito

@@ -8,5 +8,5 @@
 $LOAD_PATH.unshift File.expand_path('../../lib/', __FILE__)
 require "vito"
 
-shell = Vito::ShellInitializer.new(ARGV)
+shell = Vito::CommandLine::String.new(ARGV)
 shell.run

data/lib/vito.rb

@@ -1,8 +1,12 @@
 require "rubygems"
 require "bundler/setup"
-require "active_support/inflector"
 
 module Vito
+  class Recipe; end
+
+  module OperatingSystems
+    class Unix; end
+  end
 end
 
 current_path = File.expand_path("../", __FILE__)

data/lib/vito/command_line/command.rb

@@ -0,0 +1,21 @@
+module Vito
+  module CommandLine
+    class Command
+      def initialize(command_line)
+        @command_line = command_line
+      end
+
+      def command
+        if command_line.options.help
+          "help"
+        else
+          "install"
+        end
+      end
+
+      private
+
+      attr_reader :command_line
+    end
+  end
+end

data/lib/vito/command_line/document_flags.rb

@@ -0,0 +1,30 @@
+module Vito
+  module CommandLine
+    module DocumentFlags
+      def self.included(base)
+        base.extend ClassMethods
+      end
+
+      module ClassMethods
+        @@flags        ||= []
+        @@descriptions ||= []
+
+        def flags
+          @@flags
+        end
+
+        def descriptions
+          @@descriptions
+        end
+
+        def flag(flag)
+          @@flags << flag
+        end
+
+        def desc(description)
+          @@descriptions << description
+        end
+      end
+    end
+  end
+end

data/lib/vito/command_line/options.rb

@@ -0,0 +1,41 @@
+require "vito/command_line/document_flags"
+
+module Vito
+  module CommandLine
+    class Options
+      include Vito::CommandLine::DocumentFlags
+
+      def initialize(argv)
+        @argv = argv
+      end
+
+      flag ["-f", "--file filename"]
+      desc "Defines a file"
+      def file
+        file = nil
+        argv.each_with_index { |value, index| file = argv[index+1] if file?(value) }
+        file
+      end
+
+      flag ["-h", "--help"]
+      desc "Shows this documentation"
+      def help
+        argv.any? { |a| ["-h", "--help"].include?(a) }
+      end
+
+      def available_options
+        flags        = self.class.flags
+        descriptions = self.class.descriptions
+        flags.each_with_index.map { |flag, index| [flag, descriptions[index]] }
+      end
+
+      private
+
+      attr_reader :argv
+
+      def file?(value)
+        ["-f", "--file"].include?(value)
+      end
+    end
+  end
+end

data/lib/vito/command_line/string.rb

@@ -0,0 +1,35 @@
+module Vito
+  module CommandLine
+    class String
+      def initialize(argv)
+        @argv = argv
+      end
+
+      def run
+        "Vito::Commands::#{command.camelize}".constantize.new(self).perform
+      end
+
+      # Options are anything that comes after dashes in the command line:
+      #
+      #   -f filename
+      #   --file filename
+      #
+      def options
+        Vito::CommandLine::Options.new(argv)
+      end
+
+      # Command is the first part of the command string, if any given:
+      #
+      #   vito commands
+      #
+      # In this case, it'll run the `commands` command.
+      def command
+        Vito::CommandLine::Command.new(self).command
+      end
+
+      private
+
+      attr_reader :argv
+    end
+  end
+end

data/lib/vito/commands/help.rb

@@ -0,0 +1,62 @@
+module Vito
+  module Commands
+    class Help
+      def initialize(command_line)
+        @command_line = command_line
+      end
+
+      def perform
+        output = ""
+
+        output << "Usage: vito [COMMAND] [OPTIONS]\n"
+        output << "\n"
+        output << "Options:\n"
+        output << "\n"
+
+        available_options.each do |option|
+          output << "\s\s"
+          output << option[0].join(", ")
+          output << ("\s" * tabs_needed_for_flags(option[0]))
+          output << "\s\s"
+          output << option[1]
+          output << "\n"
+        end
+
+        puts output
+      end
+
+      private
+
+      attr_reader :command_line
+
+      def available_options
+        command_line.options.available_options
+      end
+
+      def tabs_needed_for_flags(option)
+        longer_option - count_flags_chars(option)
+      end
+
+      def longer_option
+        max_chars = 0
+        flags.each do |option|
+          options_flags_chars = count_flags_chars(option)
+          max_chars = options_flags_chars if options_flags_chars > max_chars
+        end
+        max_chars
+      end
+
+      def flags
+        available_options.map { |o| o[0] }
+      end
+
+      def count_flags_chars(option)
+        total_chars = 0
+        option.each do |flag|
+          total_chars+= flag.size
+        end
+        total_chars
+      end
+    end
+  end
+end

data/lib/vito/commands/install.rb

@@ -0,0 +1,17 @@
+module Vito
+  module Commands
+    class Install
+      def initialize(command_line)
+        @command_line = command_line
+      end
+
+      def perform
+        Vito::DslFile.new(command_line).run
+      end
+
+      private
+
+      attr_reader :command_line
+    end
+  end
+end

data/lib/vito/core_ext/string.rb

@@ -0,0 +1,33 @@
+class String
+  def camelize
+    self.split("_").map { |w| w.capitalize! }.join("")
+  end
+
+  # Taken from ActiveSupport
+  def constantize
+    camel_cased_word = self
+    names = camel_cased_word.split('::')
+    names.shift if names.empty? || names.first.empty?
+
+    names.inject(Object) do |constant, name|
+      if constant == Object
+        constant.const_get(name)
+      else
+        candidate = constant.const_get(name)
+        next candidate if constant.const_defined?(name, false)
+        next candidate unless Object.const_defined?(name)
+
+        # Go down the ancestors to check it it's owned
+        # directly before we reach Object or the end of ancestors.
+        constant = constant.ancestors.inject do |const, ancestor|
+          break const    if ancestor == Object
+          break ancestor if ancestor.const_defined?(name, false)
+          const
+        end
+
+        # owner is in Object, so raise
+        constant.const_get(name, false)
+      end
+    end
+  end
+end

data/lib/vito/dsl/installation.rb

@@ -7,8 +7,11 @@ module Vito
         @connection = connection
       end
 
-      def install
-        "Vito::Recipes::#{@name.camelize}".constantize.new(@options, @connection).run
+      def install(&block)
+        klass = "Vito::Recipes::#{@name.camelize}::Install".constantize
+        recipe = klass.new(@options, @connection)
+        recipe.instance_eval(&block) if block_given?
+        recipe.install
       end
     end
   end