magicmonkey 0.1.2 → 0.1.3

data/.gitignore

@@ -0,0 +1,21 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC

data/README.rdoc

@@ -1,6 +1,6 @@
 = Magicmonkey
 
-Magicmonkey is a useful script that can manage your Ruby on Rails application.
+Magicmonkey is a useful script that can manage your Ruby on Rails applications.
 Magicmonkey allows you to build in easy way the follow web server architecture:
 
 
@@ -21,7 +21,7 @@ Magicmonkey allows you to build in easy way the follow web server architecture:
     +-------------------------------+ +-------------------------------+ +-------------------------------+
     
     
-Every your web application have a virtual host like this:
+Every your web applications have a virtual host like this:
 
     <VirtualHost *:80>
       ServerName foo.com

data/Rakefile

@@ -1,56 +1 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "magicmonkey"
-    gem.version = File.exist?('VERSION') ? File.read('VERSION').strip : ''
-    gem.summary = %Q{Manage your Rails applications: different Ruby versions and different application servers}
-    gem.description = %Q{Manage your Rails applications: different Ruby versions and different application servers.}
-    gem.email = "enrico@megiston.it"
-    gem.homepage = "http://github.com/pioz/magicmonkey"
-    gem.authors = ["pioz"]
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    #gem.add_dependency 'nokogiri'
-    #gem.add_dependency 'activerecord'
-    #gem.add_dependency 'sqlite3-ruby'
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "magicmonkey #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'bundler/gem_tasks'

data/bin/magicmonkey

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$APP_PATH = "#{File.dirname(__FILE__)}/.."
-require "#{$APP_PATH}/lib/magic_monkey.rb"
+$APP_PATH = File.expand_path("#{File.dirname(__FILE__)}/..")
+require "#{$APP_PATH}/lib/magicmonkey/magicmonkey"
 
 MagicMonkey.main(ARGV)

data/lib/{magic_monkey.rb → magicmonkey/magicmonkey.rb}

@@ -1,7 +1,8 @@
 require 'optparse'
 require 'pp'
 require 'etc'
-require "#{$APP_PATH}/lib/configuration"
+require "#{$APP_PATH}/lib/magicmonkey/version"
+require "#{$APP_PATH}/lib/magicmonkey/configuration"
 
 module MagicMonkey
   COMMANDS = [:start, :stop, :restart, :add, :remove, :show]
@@ -11,7 +12,7 @@ module MagicMonkey
     Process::UID.change_privilege(Conf[:uid] || Process.uid)
     command = argv[0]
     if command == '-v' || command == '--version'
-      puts File.exist?("#{$APP_PATH}/VERSION") ? File.read("#{$APP_PATH}/VERSION").strip : ''
+      puts Magicmonkey::VERSION
       exit
     elsif command.nil? || command == '-h' || command == '--help' || !COMMANDS.include?(command.to_sym)
       main_help
@@ -217,6 +218,7 @@ module MagicMonkey
       if input.upcase == "Y\n" || input == "\n"
         if create_vhost
           vh = YAML.load_file(vhost_template)[:vhost_template]
+          vh.gsub!('$APP_NAME', app_name)
           vh.gsub!('$SERVER_NAME', server_name || app_name)
           #vh.gsub!('$DOCUMENT_ROOT', Conf[app_name][:app_path])
           vh.gsub!('$PORT', Conf[app_name][:port].to_s)

data/lib/magicmonkey/version.rb

@@ -0,0 +1,3 @@
+module Magicmonkey
+  VERSION = '0.1.3'
+end

data/magicmonkey.gemspec

@@ -1,57 +1,20 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "magicmonkey/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{magicmonkey}
-  s.version = "0.0.10"
+  s.name        = "magicmonkey"
+  s.version     = Magicmonkey::VERSION
+  s.authors     = ["Enrico Pilotto"]
+  s.email       = ["enrico@megiston.it"]
+  s.homepage    = "https://github.com/pioz/magicmonkey"
+  s.summary     = %q{Manage your Rails applications: different Ruby versions and different application servers}
+  s.description = %q{Manage your Rails applications: different Ruby versions and different application servers.}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["pioz"]
-  s.date = %q{2010-10-28}
-  s.default_executable = %q{magicmonkey}
-  s.description = %q{Manage your Rails applications: different Ruby versions and different application servers}
-  s.email = %q{enrico@megiston.it}
-  s.executables = ["magicmonkey"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "bin/magicmonkey",
-     "lib/configuration.rb",
-     "lib/magic_monkey.rb",
-     "magicmonkey.gemspec",
-     "test/helper.rb",
-     "test/test_magic_monkey.rb"
-  ]
-  s.homepage = %q{http://github.com/pioz/magicmonkey}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Manage your Rails applications: different Ruby versions and different application servers}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_magic_monkey.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = "magicmonkey"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-  end
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 end
-

metadata

@@ -1,76 +1,61 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: magicmonkey
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.3
   prerelease: 
-  version: 0.1.2
 platform: ruby
-authors: 
-- pioz
+authors:
+- Enrico Pilotto
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-24 00:00:00 +02:00
-default_executable: magicmonkey
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id001
-description: "Manage your Rails applications: different Ruby versions and different application servers."
-email: enrico@megiston.it
-executables: 
+date: 2011-10-11 00:00:00.000000000Z
+dependencies: []
+description: ! 'Manage your Rails applications: different Ruby versions and different
+  application servers.'
+email:
+- enrico@megiston.it
+executables:
 - magicmonkey
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
-files: 
+extra_rdoc_files: []
+files:
+- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - bin/magicmonkey
-- lib/configuration.rb
-- lib/magic_monkey.rb
+- lib/magicmonkey/configuration.rb
+- lib/magicmonkey/magicmonkey.rb
+- lib/magicmonkey/version.rb
 - magicmonkey.gemspec
 - test/helper.rb
 - test/test_magic_monkey.rb
-has_rdoc: true
-homepage: http://github.com/pioz/magicmonkey
+homepage: https://github.com/pioz/magicmonkey
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.6.2
+rubyforge_project: magicmonkey
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: "Manage your Rails applications: different Ruby versions and different application servers"
-test_files: []
-
+summary: ! 'Manage your Rails applications: different Ruby versions and different
+  application servers'
+test_files:
+- test/helper.rb
+- test/test_magic_monkey.rb

data/VERSION

@@ -1 +0,0 @@
-0.1.2