fezzik 0.7.2 → 0.7.3

data/.gitignore

@@ -1,2 +1,3 @@
 *.gem
 Gemfile.lock
+.vagrant

data/Rakefile

@@ -1,3 +1,14 @@
+require "rake/testtask"
+
+task :test => ["test:integrations"]
+
+namespace :test do
+  Rake::TestTask.new(:integrations) do |task|
+    task.libs << "test"
+    task.test_files = FileList["test/integration/**/*_test.rb"]
+  end
+end
+
 desc "remove built gems"
 task :clean do
   sh "rm fezzik-*" rescue true
@@ -12,4 +23,3 @@ desc "install gem"
 task :install => [:clean, :build] do
   sh "gem install `ls fezzik-*`"
 end
-

data/Vagrantfile

@@ -0,0 +1,99 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant::Config.run do |config|
+  # All Vagrant configuration is done here. The most common configuration
+  # options are documented and commented below. For a complete reference,
+  # please see the online documentation at vagrantup.com.
+
+  # Every Vagrant virtual environment requires a box to build off of.
+  config.vm.box = "lucid32"
+
+  # The url from where the 'config.vm.box' box will be fetched if it
+  # doesn't already exist on the user's system.
+  config.vm.box_url = "http://files.vagrantup.com/lucid32.box"
+
+  # Boot with a GUI so you can see the screen. (Default is headless)
+  # config.vm.boot_mode = :gui
+
+  # Assign this VM to a host-only network IP, allowing you to access it
+  # via the IP. Host-only networks can talk to the host machine as well as
+  # any other machines on the same network, but cannot be accessed (through this
+  # network interface) by any external networks.
+  # config.vm.network :hostonly, "192.168.33.10"
+
+  # Assign this VM to a bridged network, allowing you to connect directly to a
+  # network using the host's network device. This makes the VM appear as another
+  # physical device on your network.
+  # config.vm.network :bridged
+
+  # Forward a port from the guest to the host, which allows for outside
+  # computers to access the VM, whereas host only networking does not.
+  # config.vm.forward_port 80, 8080
+
+  # Share an additional folder to the guest VM. The first argument is
+  # an identifier, the second is the path on the guest to mount the
+  # folder, and the third is the path on the host to the actual folder.
+  # config.vm.share_folder "v-data", "/vagrant_data", "../data"
+
+  # Enable provisioning with Puppet stand alone.  Puppet manifests
+  # are contained in a directory path relative to this Vagrantfile.
+  # You will need to create the manifests directory and a manifest in
+  # the file base.pp in the manifests_path directory.
+  #
+  # An example Puppet manifest to provision the message of the day:
+  #
+  # # group { "puppet":
+  # #   ensure => "present",
+  # # }
+  # #
+  # # File { owner => 0, group => 0, mode => 0644 }
+  # #
+  # # file { '/etc/motd':
+  # #   content => "Welcome to your Vagrant-built virtual machine!
+  # #               Managed by Puppet.\n"
+  # # }
+  #
+  # config.vm.provision :puppet do |puppet|
+  #   puppet.manifests_path = "manifests"
+  #   puppet.manifest_file  = "base.pp"
+  # end
+
+  # Enable provisioning with chef solo, specifying a cookbooks path, roles
+  # path, and data_bags path (all relative to this Vagrantfile), and adding
+  # some recipes and/or roles.
+  #
+  # config.vm.provision :chef_solo do |chef|
+  #   chef.cookbooks_path = "../my-recipes/cookbooks"
+  #   chef.roles_path = "../my-recipes/roles"
+  #   chef.data_bags_path = "../my-recipes/data_bags"
+  #   chef.add_recipe "mysql"
+  #   chef.add_role "web"
+  #
+  #   # You may also specify custom JSON attributes:
+  #   chef.json = { :mysql_password => "foo" }
+  # end
+
+  # Enable provisioning with chef server, specifying the chef server URL,
+  # and the path to the validation key (relative to this Vagrantfile).
+  #
+  # The Opscode Platform uses HTTPS. Substitute your organization for
+  # ORGNAME in the URL and validation key.
+  #
+  # If you have your own Chef Server, use the appropriate URL, which may be
+  # HTTP instead of HTTPS depending on your configuration. Also change the
+  # validation key to validation.pem.
+  #
+  # config.vm.provision :chef_client do |chef|
+  #   chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
+  #   chef.validation_key_path = "ORGNAME-validator.pem"
+  # end
+  #
+  # If you're using the Opscode platform, your validator client is
+  # ORGNAME-validator, replacing ORGNAME with your organization name.
+  #
+  # IF you have your own Chef Server, the default validation client name is
+  # chef-validator, unless you changed the configuration.
+  #
+  #   chef.validation_client_name = "ORGNAME-validator"
+end

data/bin/fez

@@ -2,7 +2,6 @@
 
 require "rubygems"
 require "rake"
-require "colorize"
 require "fezzik"
 
 # Required for using rake/remote-task with rake >= 0.9.x
@@ -10,18 +9,21 @@ include Rake::DSL
 
 Fezzik.activated = true
 
-def usage
-  <<-EOF
+USAGE = <<EOF
 Version #{Fezzik::VERSION}
 fez <destination> <tasks>  # Run deployment tasks on destination servers
 fez get <tasks>            # Download tasks to use in your project
 fez -T                     # Display all tasks
-  EOF
-end
+EOF
 
 def print_usage_and_exit
-  puts usage
-  exit 1
+  puts USAGE
+  exit
+end
+
+def print_version_and_exit
+  puts "Version #{Fezzik::VERSION}"
+  exit
 end
 
 def display_tasks_and_exit
@@ -30,7 +32,7 @@ def display_tasks_and_exit
   Rake.application.options.show_task_pattern = /^fezzik:/
   output = Fezzik::Util.capture_output { Rake.application.display_tasks_and_comments }
   output.gsub!(/^rake fezzik:/, "fez <destination> ")
-  puts output
+  puts output.strip.empty? ? "(No Fezzik tasks with descriptions are defined.)" : output
   exit 0
 end
 
@@ -40,9 +42,9 @@ def download_tasks_and_exit
     task += ".rake" unless task =~ /\.rake$/
     system("curl -f #{TASKS_URL}/#{task} -o #{task} > /dev/null 2>&1")
     if $? == 0
-      puts "    [new]".green + "  #{task}"
+      puts Fezzik.color_string("    [new]", :green) + "  #{task}"
     else
-      puts "    [fail]".red + " #{task}"
+      puts Fezzik.color_string("    [fail]", :red) + " #{task}"
     end
   end
   exit 0
@@ -61,7 +63,7 @@ def run_fezzik_tasks
   rescue Rake::ConfigurationError => e
     puts "Invalid destination: #{Fezzik.target_destination}"
     puts "Make sure this destination is configured and includes `set :domain, \"yourdomain.com\"`"
-    puts "[fail]".red
+    puts Fezzik.color_string("[fail]", :red)
     exit 1
   end
   begin
@@ -70,21 +72,23 @@ def run_fezzik_tasks
       task_name, params = Fezzik::Util.split_task_and_params(task_with_params)
       Rake::Task["fezzik:#{task_name}"].invoke(params)
     end
-    puts "[success]".green
+    puts Fezzik.color_string("[success]", :green)
   rescue SystemExit, Rake::CommandFailedError => e
-    puts "[fail]".red
+    puts Fezzik.color_string("[fail]", :red)
     exit 1
   rescue StandardError => e
     puts e.message
     puts e.backtrace
-    puts "[fail]".red
+    puts Fezzik.color_string("[fail]", :red)
     fail
   end
 end
 
 case ARGV[0]
-when nil, "-h" then print_usage_and_exit
-when "-T" then display_tasks_and_exit
+when nil then abort USAGE
+when "-h", "--help" then print_usage_and_exit
+when "-v", "--version" then print_version_and_exit
+when "-T", "--tasks" then display_tasks_and_exit
 when "get" then download_tasks_and_exit
 else run_fezzik_tasks
 end

data/fezzik.gemspec

@@ -22,5 +22,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   s.add_dependency("rake-remote_task", "~>2.0.2")
-  s.add_dependency("colorize", ">=0.5.8")
+
+  s.add_development_dependency("scope", "~>0.2.3")
+  s.add_development_dependency("vagrant", "~>1.0.5")
 end

data/lib/fezzik.rb

@@ -2,11 +2,12 @@ require "stringio"
 require "thread"
 require "rake"
 require "rake/remote_task"
-require "colorize"
 require "fezzik/base"
+require "fezzik/colors"
 require "fezzik/dsl"
 require "fezzik/environment"
 require "fezzik/role"
 require "fezzik/io"
+require "fezzik/thread_local_io"
 require "fezzik/util"
 require "fezzik/version"

data/lib/fezzik/colors.rb

@@ -0,0 +1,7 @@
+module Fezzik
+  COLORS = { :red => 1, :green => 2 }
+  def self.color_string(string, color)
+    return string unless STDOUT.isatty
+    "\e[01;#{COLORS[color]+30}m#{string}\e[m"
+  end
+end

data/lib/fezzik/thread_local_io.rb

@@ -0,0 +1,45 @@
+# Overrides $stdout and allows it to be overridden by the thread-local variable Thread.current[:stdout].
+#
+# If Thread.current[:stdout] is set, the thread will write all output there. Otherwise the thread will
+# use $stdout as normal.
+#
+# Example usage:
+#
+# out = StringIO.new
+#
+# Thread.start do
+#   Thread.current[:stdout] = out
+#   puts "thread1"
+# end.join
+#
+# Thread.start do
+#   puts "thread2"
+# end.join
+#
+# puts out.string
+#
+# Output:
+#   thread2
+#   thread1
+
+class ThreadLocalIO < IO
+  @@former_stdout = $stdout
+
+  def self.write(*args)
+    if Thread.current[:stdout]
+      Thread.current[:stdout].write(*args)
+    else
+      @@former_stdout.write(*args)
+    end
+  end
+
+  def self.flush
+    if Thread.current[:stdout]
+      Thread.current[:stdout].flush
+    else
+      @@former_stdout.flush
+    end
+  end
+end
+
+$stdout = ThreadLocalIO

data/lib/fezzik/util.rb

@@ -2,11 +2,11 @@ module Fezzik
   module Util
     def self.capture_output(&block)
       output = StringIO.new
-      $stdout = output
+      Thread.current[:stdout] = output
       block.call
-      return output.string
+      output.string
     ensure
-      $stdout = STDOUT
+      Thread.current[:stdout] = STDOUT
     end
 
     def self.split_task_and_params(task_with_params)

data/lib/fezzik/version.rb

@@ -1,3 +1,3 @@
 module Fezzik
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

data/test/integration/base_test.rb

@@ -0,0 +1,19 @@
+require File.expand_path("../integration_test_helper", File.dirname(__FILE__))
+
+class BaseTest < Scope::TestCase
+  context "base" do
+
+    namespace :fezzik do
+      remote_task(:touch, :path) { |t, args| run "touch #{args[:path]}" }
+      remote_task(:rm, :path) { |t, args| run "rm #{args[:path]}" }
+    end
+
+    should "create and delete files on the remote host" do
+      fez :touch, "/tmp/touch"
+      assert_file_exists("/tmp/touch")
+
+      fez :rm, "/tmp/touch"
+      refute_file_exists("/tmp/touch")
+    end
+  end
+end

data/test/integration/environment_test.rb

@@ -0,0 +1,22 @@
+require File.expand_path("../integration_test_helper", File.dirname(__FILE__))
+
+class EnvironmentTest < Scope::TestCase
+  context "environment" do
+
+    destination :vagrant do
+      env :hero, "mario"
+      env :villain, "bowser", :hosts => [VAGRANT_DOMAIN]
+    end
+
+    should "store environment settings" do
+      assert_equal "mario", Fezzik.environments[VAGRANT_DOMAIN][:hero]
+    end
+
+    should "store environment settings for a subset of hosts" do
+      # This isn't actually a great test for this, but testing with multiple hosts would require a second
+      # vagrant configuration.
+      assert_equal "bowser", Fezzik.environments[VAGRANT_DOMAIN][:villain]
+    end
+  end
+end
+

data/test/integration_test_helper.rb

@@ -0,0 +1,47 @@
+require "bundler/setup"
+require "scope"
+require "minitest/autorun"
+
+require "fezzik"
+include Fezzik::DSL
+include Rake::DSL
+
+ENV["fezzik_destination"] = "vagrant"
+Fezzik.init
+
+VAGRANT_DOMAIN = "fezzik-vagrant"
+
+destination :vagrant do
+  set :user, "vagrant"
+  set :domain, VAGRANT_DOMAIN
+end
+
+def setup_vagrant
+  system("mkdir -p ~/.ssh; touch ~/.ssh/config")
+  ssh_configured = `grep "fezzik-vagrant" ~/.ssh/config`.size > 0
+  unless ssh_configured
+    puts "Generating vagrant ssh config in ~/.ssh/config"
+    ssh_config = `vagrant ssh-config`.gsub("Host default", "\nHost fezzik-vagrant") << "  LogLevel QUIET\n"
+    system("echo '#{ssh_config}' >> ~/.ssh/config")
+  end
+
+  vagrant_running = `vagrant status | grep "running"`.size > 0
+  unless vagrant_running
+    puts "Starting vagrant (run 'vagrant halt' to shutdown)"
+    system("vagrant up")
+  end
+end
+
+def fez(task, params = nil)
+  Rake::Task["fezzik:#{task}"].invoke(params)
+end
+
+def assert_file_exists(path)
+  assert_equal path, `ssh vagrant@fezzik-vagrant ls #{path} 2> /dev/null`.chomp
+end
+
+def refute_file_exists(path)
+  refute_equal path, `ssh vagrant@fezzik-vagrant ls #{path} 2> /dev/null`.chomp
+end
+
+setup_vagrant()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fezzik
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-remote_task
@@ -29,21 +29,37 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.2
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: scope
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.8
-  type: :runtime
+        version: 0.2.3
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.3
+- !ruby/object:Gem::Dependency
+  name: vagrant
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.8
+        version: 1.0.5
 description: A light deployment system that gets out of your way
 email: dmacdougall@gmail.com
 executables:
@@ -55,20 +71,26 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- Vagrantfile
 - bin/fez
 - fezzik.gemspec
 - lib/fezzik.rb
 - lib/fezzik/base.rb
+- lib/fezzik/colors.rb
 - lib/fezzik/dsl.rb
 - lib/fezzik/environment.rb
 - lib/fezzik/io.rb
 - lib/fezzik/role.rb
+- lib/fezzik/thread_local_io.rb
 - lib/fezzik/util.rb
 - lib/fezzik/version.rb
 - tasks/command.rake
 - tasks/deploy.rake
 - tasks/environment.rake
 - tasks/rollback.rake
+- test/integration/base_test.rb
+- test/integration/environment_test.rb
+- test/integration_test_helper.rb
 homepage: http://github.com/dmacdougall/fezzik
 licenses: []
 post_install_message: