hostess 0.1.7 → 0.1.8

data/Rakefile

@@ -1,6 +1,6 @@
 require "rubygems"
-require "rake/gempackagetask"
-require "rake/rdoctask"
+require "rubygems/package_task"
+require 'rdoc/task'
 
 require "rake/testtask"
 Rake::TestTask.new do |t|
@@ -17,32 +17,32 @@ task :default => ["test"]
 #   http://rubygems.org/read/chapter/20
 #
 spec = Gem::Specification.new do |s|
-  
+
   # Change these as appropriate
   s.name              = "hostess"
-  s.version           = "0.1.7"
+  s.version           = "0.1.8"
   s.summary           = "Manage simple apache virtual hosts"
   s.author            = "Chris Roos, James Adam"
   s.email             = "chris@chrisroos.co.uk"
   s.homepage          = "http://chrisroos.co.uk"
 
   s.has_rdoc          = false
-  
+
   # You should probably have a README of some kind. Change the filename
   # as appropriate
   s.extra_rdoc_files  = %w(README.md)
   s.rdoc_options      = %w(--main README.md)
-  
+
   s.require_paths     = ['bin', 'lib']
 
   # Add any extra files to include in the gem (like your README)
   s.files             = %w(README.md Rakefile) + Dir.glob("{bin}/**/*") + Dir.glob("{lib}/**/*")
   s.executables       = FileList["bin/**"].map { |f| File.basename(f) }
-  
+
   # If you want to depend on other gems, add them here, along with any
   # relevant versions
   # s.add_dependency("some_other_gem", "~> 0.1.0")
-  
+
   # If your tests use any gems, include them here
   s.add_development_dependency("mocha")
 
@@ -51,13 +51,13 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "hostess"
 end
 
-# This task actually builds the gem. We also regenerate a static 
+# This task actually builds the gem. We also regenerate a static
 # .gemspec file, which is useful if something (i.e. GitHub) will
 # be automatically building a gem for this project. If you're not
 # using GitHub, edit as appropriate.
-Rake::GemPackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
-  
+
   # Generate the gemspec file for github.
   file = File.dirname(__FILE__) + "/#{spec.name}.gemspec"
   File.open(file, "w") {|f| f << spec.to_ruby }
@@ -65,7 +65,7 @@ end
 
 # Generate documentation
 Rake::RDocTask.new do |rd|
-  
+
   rd.rdoc_files.include("lib/**/*.rb")
   rd.rdoc_dir = "rdoc"
 end
@@ -75,7 +75,7 @@ task :clean => [:clobber_rdoc, :clobber_package] do
   rm "#{spec.name}.gemspec"
 end
 
-# If you want to publish to RubyForge automatically, here's a simple 
+# If you want to publish to RubyForge automatically, here's a simple
 # task to help do that. If you don't, just get rid of this.
 # Be sure to set up your Rubyforge account details with the Rubyforge
 # gem; you'll need to run `rubyforge setup` and `rubyforge config` at
@@ -83,10 +83,10 @@ end
 begin
   require "rake/contrib/sshpublisher"
   namespace :rubyforge do
-    
+
     desc "Release gem and RDoc documentation to RubyForge"
     task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
-    
+
     namespace :release do
       desc "Release a new version of this gem"
       task :gem => [:package] do
@@ -99,17 +99,17 @@ begin
         puts "Publishing #{spec.name}-#{spec.version.to_s} to Rubyforge..."
         rubyforge.add_release(spec.rubyforge_project, spec.name, spec.version.to_s, path_to_gem)
       end
-    
+
       desc "Publish RDoc to RubyForge."
       task :docs => [:rdoc] do
         config = YAML.load(
             File.read(File.expand_path('~/.rubyforge/user-config.yml'))
         )
- 
+
         host = "#{config['username']}@rubyforge.org"
         remote_dir = "/var/www/gforge-projects/hostess/" # Should be the same as the rubyforge project name
         local_dir = 'rdoc'
- 
+
         Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
       end
     end

data/lib/hostess/virtual_host.rb

@@ -17,6 +17,7 @@ module Hostess
     def delete
       delete_dns_entry
       delete_vhost
+      delete_apache_log_directory
       restart_apache
     end
     def list
@@ -28,11 +29,25 @@ module Hostess
       @options.display_banner_and_return
     end
     private
+      def dscl_works?
+        `sw_vers -productVersion`.strip < '10.7'
+      end
+      def hosts_filename
+        File.join('/', 'etc', 'hosts')
+      end
       def create_dns_entry
-        run "dscl localhost -create /Local/Default/Hosts/#{@options.domain} IPAddress 127.0.0.1"
+        if dscl_works?
+          run "dscl localhost -create /Local/Default/Hosts/#{@options.domain} IPAddress 127.0.0.1"
+        else
+          run "echo '127.0.0.1 #{@options.domain}' >> #{hosts_filename}"
+        end
       end
       def delete_dns_entry
-        run "dscl localhost -delete /Local/Default/Hosts/#{@options.domain}"
+        if dscl_works?
+          run "dscl localhost -delete /Local/Default/Hosts/#{@options.domain}"
+        else
+          run "perl -pi -e 's/127.0.0.1 #{@options.domain}\\n//g' #{hosts_filename}"
+        end
       end
       def create_vhost
         tempfile = Tempfile.new('vhost')
@@ -49,6 +64,9 @@ module Hostess
       def create_apache_log_directory
         run "mkdir -p #{apache_log_directory}"
       end
+      def delete_apache_log_directory
+        run "rm -r #{apache_log_directory}"
+      end
       def vhost_config
         domain, directory = @options.domain, @options.directory
         template = <<-EOT
@@ -101,4 +119,4 @@ module Hostess
          "sudo -s \"#{cmd}\""
       end
   end
-end
+end

metadata

@@ -1,87 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hostess
-version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 7
-  version: 0.1.7
+version: !ruby/object:Gem::Version
+  version: 0.1.8
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Chris Roos, James Adam
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-15 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mocha
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: chris@chrisroos.co.uk
-executables: 
+executables:
 - hostess
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - README.md
 - Rakefile
 - bin/hostess
 - lib/hostess/options.rb
 - lib/hostess/virtual_host.rb
 - lib/hostess.rb
-has_rdoc: false
 homepage: http://chrisroos.co.uk
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.md
-require_paths: 
+require_paths:
 - bin
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: hostess
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Manage simple apache virtual hosts
 test_files: []
-