vito 0.0.4 → 0.0.5

data/spec/vito/tests/vagrant_test_box_spec.rb

@@ -0,0 +1,69 @@
+require "spec_helper"
+
+describe Vito::Tests::VagrantTestBox do
+  let(:os_name) { "ubuntu10" }
+
+  subject { described_class.new(os_name) }
+
+  describe ".boxes" do
+    context "no custom box names passed in" do
+      it "returns class instances for each box" do
+        described_class.boxes.any? { |b| b.name == "centos63" }.should be_true
+        described_class.boxes.any? { |b| b.name == "ubuntu10" }.should be_true
+        described_class.boxes.any? { |b| b.name == "ubuntu12" }.should be_true
+      end
+    end
+
+    context "custom box names passed in" do
+      it "returns class instances for each box" do
+        described_class.boxes(:ubuntu10, :ubuntu12).any? { |b| b.name == "ubuntu12" }.should be_true
+        described_class.boxes(:ubuntu10, :ubuntu12).any? { |b| b.name == "ubuntu10" }.should be_true
+        described_class.boxes(:ubuntu10, :ubuntu12).any? { |b| b.name == "centos63" }.should be_false
+        described_class.boxes(:ubuntu10).any? { |b| b.name == "ubuntu10" }.should be_true
+        described_class.boxes(:ubuntu10).any? { |b| b.name == "centos63" }.should be_false
+        described_class.boxes(:ubuntu10).any? { |b| b.name == "ubuntu12" }.should be_false
+      end
+    end
+  end
+
+  describe "#ssh_port" do
+    context "ubuntu10" do
+      let(:os_name) { "ubuntu10" }
+      its(:ssh_port) { should == "2223" }
+    end
+
+    context "ubuntu12" do
+      let(:os_name) { "ubuntu12" }
+      its(:ssh_port) { should == "2224" }
+    end
+
+    context "centos63" do
+      let(:os_name) { "centos63" }
+      its(:ssh_port) { should == "2225" }
+    end
+  end
+
+  describe "#path" do
+    context "ubuntu10" do
+      let(:os_name) { "ubuntu10" }
+      its(:path) { should == "spec/vagrant_boxes/ubuntu10" }
+    end
+
+    context "ubuntu12" do
+      let(:os_name) { "ubuntu12" }
+      its(:path) { should == "spec/vagrant_boxes/ubuntu12" }
+    end
+  end
+
+  describe "#initial_snapshot_name" do
+    context "ubuntu10" do
+      let(:os_name) { "ubuntu10" }
+      its(:initial_snapshot_name) { should == "ubuntu10_initial_box" }
+    end
+
+    context "ubuntu12" do
+      let(:os_name) { "ubuntu12" }
+      its(:initial_snapshot_name) { should == "ubuntu12_initial_box" }
+    end
+  end
+end

data/spec/vito/utils/program_version_spec.rb

@@ -16,9 +16,10 @@ describe Vito::Utils::ProgramVersion do
         subject.matches?("2.0.0-p195").should be_true
         subject.matches?("2.0.0p195").should be_true
         subject.matches?("2.0.0").should be_true
+        subject.matches?.should be_true
       end
 
-      it "returns false if it doesn't matche" do
+      it "returns false if it doesn't match" do
         subject.matches?("2.0.0p125").should be_false
         subject.matches?("1.9.3").should be_false
       end
@@ -35,9 +36,10 @@ describe Vito::Utils::ProgramVersion do
         subject.matches?("2.0.0").should be_false
       end
 
-      it "returns false if it doesn't matche" do
+      it "returns false if it doesn't match" do
         subject.matches?("2.0.0p125").should be_false
         subject.matches?("1.9.3").should be_false
+        subject.matches?.should be_false
       end
     end
   end

data/templates/apache2/vito_site

@@ -0,0 +1,12 @@
+<VirtualHost *:{{VITO_PORT}}>
+   ServerName {{VITO_SERVERNAME}}
+   # !!! Be sure to point DocumentRoot to 'public'!
+   DocumentRoot {{VITO_SITE_PATH}}
+   <Directory {{VITO_SITE_PATH}}>
+     # This relaxes Apache security settings.
+     AllowOverride all
+     # MultiViews must be turned off.
+     Options -MultiViews
+  </Directory>
+</VirtualHost>
+

data/vito.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Vito::VERSION
 
-  gem.add_dependency("active_support")
+  gem.add_development_dependency("rake")
   gem.add_development_dependency("rspec")
   gem.add_development_dependency("pry-debugger")
 end

data/vito.rb

@@ -1,12 +1,14 @@
 server :ruby_server, :one do
   # Vagrant box
-  connection :ssh, command: "ssh -i ~/.vagrant.d/insecure_private_key vagrant@localhost -p2222"
+  connection :ssh, command: "ssh -i ~/.vagrant.d/insecure_private_key vagrant@localhost -p2224"
 
   install :rbenv
   install :git
   install :ruby, version: "1.9.3-p125"
-  install :postgres
-  #install :tmux
-  #install :ruby_gem, :bundler
-  #install :passenger
+  #install :postgres, username: 'vito', password: 'corleone'
+  install :apache do
+    with :passenger
+    vhosts with: :ssl, path: "/var/projects/someapp/current/public"
+  end
+  # install :tmux
 end

metadata

@@ -1,23 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: vito
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Alexandre de Oliveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: active_support
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -65,16 +65,23 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- Vagrantfile
 - bin/vito
 - docs/manual.md
 - lib/samples/vito_for_rails.rb
 - lib/vito.rb
+- lib/vito/command_line/command.rb
+- lib/vito/command_line/document_flags.rb
+- lib/vito/command_line/options.rb
+- lib/vito/command_line/string.rb
+- lib/vito/commands/help.rb
+- lib/vito/commands/install.rb
 - lib/vito/connection.rb
+- lib/vito/core_ext/string.rb
 - lib/vito/dsl/installation.rb
 - lib/vito/dsl/server.rb
 - lib/vito/dsl_file.rb
@@ -83,13 +90,20 @@ files:
 - lib/vito/operating_systems/ubuntu_10.rb
 - lib/vito/output.rb
 - lib/vito/recipe.rb
-- lib/vito/recipes/git.rb
-- lib/vito/recipes/postgres.rb
-- lib/vito/recipes/rbenv.rb
-- lib/vito/recipes/ruby.rb
-- lib/vito/shell_initializer.rb
+- lib/vito/recipes/apache/install.rb
+- lib/vito/recipes/apache/service.rb
+- lib/vito/recipes/git/install.rb
+- lib/vito/recipes/passenger/install.rb
+- lib/vito/recipes/passenger/paths.rb
+- lib/vito/recipes/postgres/install.rb
+- lib/vito/recipes/rbenv/install.rb
+- lib/vito/recipes/ruby/install.rb
+- lib/vito/recipes/ruby/paths.rb
+- lib/vito/tasks/vagrant_bootstrap.rb
+- lib/vito/tests/vagrant_test_box.rb
 - lib/vito/utils/program_version.rb
 - lib/vito/version.rb
+- spec/acceptance/recipes/apache_acceptance_spec.rb
 - spec/acceptance/recipes/git_acceptance_spec.rb
 - spec/acceptance/recipes/postgres_acceptance_spec.rb
 - spec/acceptance/recipes/rbenv_acceptance_spec.rb
@@ -97,7 +111,16 @@ files:
 - spec/fixtures/vito.rb
 - spec/spec_helper.rb
 - spec/support/vagrant.rb
+- spec/vagrant_boxes/centos63/.gitkeep
+- spec/vagrant_boxes/centos63/Vagrantfile
+- spec/vagrant_boxes/ubuntu10/Vagrantfile
+- spec/vagrant_boxes/ubuntu12/Vagrantfile
+- spec/vito/command_line/command_spec.rb
+- spec/vito/command_line/options_spec.rb
+- spec/vito/command_line/string_spec.rb
+- spec/vito/commands/install_spec.rb
 - spec/vito/connection_spec.rb
+- spec/vito/core_ext/string_spec.rb
 - spec/vito/dsl/installation_spec.rb
 - spec/vito/dsl/server_spec.rb
 - spec/vito/dsl_file_spec.rb
@@ -106,10 +129,14 @@ files:
 - spec/vito/operating_systems/ubuntu_10_spec.rb
 - spec/vito/output_spec.rb
 - spec/vito/recipe_spec.rb
+- spec/vito/recipes/apache/install_spec.rb
 - spec/vito/recipes/git_spec.rb
+- spec/vito/recipes/passenger/paths_spec.rb
 - spec/vito/recipes/ruby_spec.rb
-- spec/vito/shell_initializer_spec.rb
+- spec/vito/tasks/vagrant_bootstrap_spec.rb
+- spec/vito/tests/vagrant_test_box_spec.rb
 - spec/vito/utils/program_version_spec.rb
+- templates/apache2/vito_site
 - vito.gemspec
 - vito.rb
 homepage: http://github.com/kurko/vito
@@ -132,11 +159,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.4
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Install webserver environments automatically in an easier way
 test_files:
+- spec/acceptance/recipes/apache_acceptance_spec.rb
 - spec/acceptance/recipes/git_acceptance_spec.rb
 - spec/acceptance/recipes/postgres_acceptance_spec.rb
 - spec/acceptance/recipes/rbenv_acceptance_spec.rb
@@ -144,7 +172,16 @@ test_files:
 - spec/fixtures/vito.rb
 - spec/spec_helper.rb
 - spec/support/vagrant.rb
+- spec/vagrant_boxes/centos63/.gitkeep
+- spec/vagrant_boxes/centos63/Vagrantfile
+- spec/vagrant_boxes/ubuntu10/Vagrantfile
+- spec/vagrant_boxes/ubuntu12/Vagrantfile
+- spec/vito/command_line/command_spec.rb
+- spec/vito/command_line/options_spec.rb
+- spec/vito/command_line/string_spec.rb
+- spec/vito/commands/install_spec.rb
 - spec/vito/connection_spec.rb
+- spec/vito/core_ext/string_spec.rb
 - spec/vito/dsl/installation_spec.rb
 - spec/vito/dsl/server_spec.rb
 - spec/vito/dsl_file_spec.rb
@@ -153,7 +190,10 @@ test_files:
 - spec/vito/operating_systems/ubuntu_10_spec.rb
 - spec/vito/output_spec.rb
 - spec/vito/recipe_spec.rb
+- spec/vito/recipes/apache/install_spec.rb
 - spec/vito/recipes/git_spec.rb
+- spec/vito/recipes/passenger/paths_spec.rb
 - spec/vito/recipes/ruby_spec.rb
-- spec/vito/shell_initializer_spec.rb
+- spec/vito/tasks/vagrant_bootstrap_spec.rb
+- spec/vito/tests/vagrant_test_box_spec.rb
 - spec/vito/utils/program_version_spec.rb

data/lib/vito/recipes/git.rb

@@ -1,37 +0,0 @@
-module Vito
-  module Recipes
-    class Git < Vito::Recipe
-      def run
-        if git_installed?
-          Vito::Log.write "Git is already installed."
-        else
-          Vito::Log.write "Installing Git's OS dependencies"
-          install_os_dependencies
-          Vito::Log.write "Installing Git itself"
-          install_git
-        end
-      end
-
-      private
-
-      def git_installed?
-        query("git --version").success?
-      end
-
-      def install_git
-        string = []
-        string << "sudo apt-get install -y git-core"
-        string << "git --version"
-        run_command(string.join(" && "))
-      end
-
-      def os_dependencies
-        %w(build-essential openssl libreadline6
-           libreadline6-dev zlib1g zlib1g-dev libssl-dev
-           libyaml-dev libsqlite3-0 libsqlite3-dev sqlite3
-           libxml2-dev libxslt1-dev autoconf libc6-dev
-           libncurses5-dev)
-      end
-    end
-  end
-end

data/lib/vito/recipes/postgres.rb

@@ -1,104 +0,0 @@
-module Vito
-  module Recipes
-    class Postgres < Vito::Recipe
-      def run
-        if installed?
-          Vito::Log.write "Postgres already installed."
-        else
-          Vito::Log.write "Installing Postgres"
-          install_os_dependencies
-          install
-        end
-      end
-
-      private
-
-      def postgres_installed?
-        @memo ||= query("psql --version").success?
-      end
-
-      def user_exists?
-        query("sudo su - postgres -c \"psql -tAc \\\\\"SELECT 1 FROM pg_roles WHERE rolname='#{username}'\\\\\" | grep -q 1 || echo 'hey'\"").result == ""
-      end
-
-      def utf_template?
-        query("sudo su - postgres -c \"psql -d template1 -c \\\\\"SHOW SERVER_ENCODING;\\\\\" | grep -q UTF || echo 'hey'\"").result == ""
-      end
-
-      def installed?
-        # Only verifies Postgres configuration if it's installed
-        if postgres_installed?
-          Vito::Log.write "User doesn't exist. I will create one." unless user_exists?
-          Vito::Log.write "template1 database's encoding should be UTF-8. I'll adjust this." unless utf_template?
-        end
-
-        postgres_installed? &&
-          user_exists? &&
-          utf_template?
-      end
-
-      def username
-        "vitouser"
-      end
-
-      def password
-        "123456"
-      end
-
-      def install
-        string = []
-        run_command "sudo apt-get install -y postgresql-9.1 libpq-dev"
-
-        # Create user only if it doesn't exist yet
-        unless user_exists?
-          string << "sudo su - postgres -c \"createuser -d -r -s #{username}\""
-        end
-
-        run_command(string.join(" && ")) unless string.empty?
-        convert_template1_to_utf8 unless utf_template?
-        string = []
-
-        if os.is?(:ubuntu, "10")
-          string << "sudo /etc/init.d/postgresql restart"
-        else
-          string << "sudo service postgresql restart"
-        end
-        run_command "sudo su - postgres -c \"psql -d template1 -c \\\\\"alter user #{username} with password '#{password}'\\\\\";\""
-
-        run_command(string.join(" && "))
-      end
-
-      def install_os_dependencies
-        return if postgres_installed?
-        Vito::Log.write "Installing some OS dependencies first"
-        if os.is?(:ubuntu, "10")
-          run_command("sudo apt-get remove -y postgresql")
-          run_command("sudo apt-get autoremove -y")
-          run_command("sudo apt-get install -y python-software-properties")
-          run_command("sudo add-apt-repository ppa:pitti/postgresql && sudo apt-get update")
-        end
-
-        super
-      end
-
-      def os_dependencies
-        %w(libpq-dev postgresql-contrib)
-      end
-
-      def convert_template1_to_utf8
-        # In some cases, the OS locale won't be compatible with UTF-8. When
-        # creating a database, Rails will try to use Postgres' template1 with
-        # UTF-8.
-        #
-        # Here, we delete template1, then login in template0 to recreate
-        # template1 with UTF-8 encoding.
-        run_command "sudo su - postgres -c \"psql -d template1 -c \\\\\"UPDATE pg_database SET datallowconn = TRUE where datname = 'template0';\\\\\"\""
-        run_command "sudo su - postgres -c \"psql -d template0 -c \\\\\"UPDATE pg_database SET datistemplate = FALSE where datname = 'template1'; \\\\\"\""
-        run_command "sudo su - postgres -c \"psql -d template0 -c \\\\\"drop database template1; \\\\\"\""
-        run_command "sudo su - postgres -c \"psql -d template0 -c \\\\\"create database template1 with template = template0 encoding = 'UNICODE'  LC_CTYPE = 'en_US.UTF-8' LC_COLLATE = 'C'; \\\\\"\""
-        run_command "sudo su - postgres -c \"psql -d template0 -c \\\\\" UPDATE pg_database SET datistemplate = TRUE where datname = 'template1'; \\\\\"\""
-        run_command "sudo su - postgres -c \"psql -d template1 -c \\\\\" UPDATE pg_database SET datallowconn = FALSE where datname = 'template0'; \\\\\"\""
-      end
-    end
-  end
-end

data/lib/vito/recipes/rbenv.rb

@@ -1,47 +0,0 @@
-module Vito
-  module Recipes
-    class Rbenv < Vito::Recipe
-      def run
-        if rbenv_installed?
-          Vito::Log.write "Rbenv already installed."
-        else
-          Vito::Log.write "Installing Rbenv"
-          depends_on_recipe(:git)
-          install_rbenv
-          install_ruby_build
-        end
-      end
-
-      private
-
-      def rbenv_installed?
-        string = []
-        string << "cd ~/"
-        string << "rbenv commands"
-        query(string.join(" && ")).success?
-      end
-
-      def install_rbenv
-        puts "Installing Rbenv..."
-        string = []
-        # TODO verify if this folder already exists
-        run_command "git clone git://github.com/sstephenson/rbenv.git ~/.rbenv"
-
-        # TODO verify if .bashrc already have these lines
-        string = []
-        string << "echo 'eval \"$(rbenv init -)\"' | cat - ~/.bashrc > vitotemp && mv vitotemp ~/.bashrc"
-        string << "echo 'export PATH=\"\\$HOME/.rbenv/bin:\\$PATH\"' | cat - ~/.bashrc > vitotemp && mv vitotemp ~/.bashrc"
-
-        run_command string.join(" && ")
-      end
-
-      def install_ruby_build
-        puts "Installing ruby-build embedded into rbenv..."
-        string = []
-        # TODO verify if this dir already exists
-        string << "git clone https://github.com/sstephenson/ruby-build.git ~/.rbenv/plugins/ruby-build"
-        run_command string.join(" && ")
-      end
-    end
-  end
-end