visionmedia-drupal 0.0.2 → 0.0.3

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.0.3 / 2008-10-03
+
+* 1 Major Feature:
+
+  * Installer for Drupal projects
+
 === 0.0.2 / 2008-10-02
 
 * 2 Bug Fixes:

data/README.txt

@@ -17,8 +17,9 @@ to quickly generate and manage Drupal modules.
 
 == ARGUMENTS:
 
-	create module <module_name>   Generates a module skeleton from an interactive wizard.
-	todo list [total]    				  Displays list of todo items or a total.
+	create module <module_name>   		Generates a module skeleton from an interactive wizard.
+	todo list [total]    				  		Displays list of todo items or a total.
+	install <core | project> [dir]  	Install a Drupal project or core itself to [dir]
 
 == OPTIONS:
 

data/drupal.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "drupal"
-  s.version  = "0.0.2"
-  s.date     = "2008-09-29"
+  s.version  = "0.0.3"
+  s.date     = "2008-10-03"
   s.summary  = "Drupal development kit"
   s.email    = "tj@vision-media.ca"
   s.homepage = "http://vision-media.ca/resources/drupal/drupal-module-builder-gem"

data/lib/drupal.rb

@@ -6,8 +6,9 @@
 #
 # == ARGUMENTS:
 # 
-# 	create module        Generates a module skeleton from an interactive wizard.
-#		todo list [total]    Displays list of todo items or a total.
+#   create module <module_name> [dir]  Generates a module skeleton from an interactive wizard. Current directory unless [dir] is specified.
+#   todo list [total]                  Displays list of todo items or a total.   
+#   install <core | project> [dir]  	 Install a Drupal project or core itself to [dir]
 #
 # == OPTIONS:
 # 
@@ -30,7 +31,13 @@
 #
 #   View total todo items only.
 #     drupal todo list total ./sites/all/modules
-     
+#    Install a module to the modules folder in my new installation (from drupal root)
+#      drupal install devel ./sites/all/modules
+#  
+#    Install a module when in the 'modules directory
+#      drupal install devel
+#  
+   
 require 'optparse'
 require 'ostruct'
 require File.dirname(__FILE__) + '/drupal/create_module'
@@ -41,7 +48,7 @@ class Drupal
   
   MAJOR = 0
   MINOR = 0
-  TINY = 2
+  TINY = 3
   VERSION = [MAJOR, MINOR, TINY].join('.')
   
   # Run the drupal development tool.
@@ -94,6 +101,7 @@ class Drupal
  
     create module <module_name> [dir]  Generates a module skeleton from an interactive wizard. Current directory unless [dir] is specified.
     todo list [total]                  Displays list of todo items or a total.   
+    install <core | project> [dir]  	 Install a Drupal project or core itself to [dir]    
     
   EXAMPLES:
   
@@ -111,6 +119,15 @@ class Drupal
 
     View total todo items only.
       drupal todo list total ./sites/all/modules   
+      
+    Install drupal core to the current directory.
+      drupal install core
+      
+    Install a module to the modules folder in my new installation (from drupal root)
+      drupal install devel ./sites/all/modules
+      
+    Install a module when in the 'modules directory
+      drupal install devel
        
 USAGE
   exit

data/lib/drupal/install.rb

@@ -1,5 +1,6 @@
 
-require 'open-uri'
+require 'zlib'
+require 'net/http'
 
 class Drupal
   class Install
@@ -7,13 +8,11 @@ class Drupal
     # Attempt to download core installation or module.
     def run(arguments)
       @project = arguments[0]
-      @dest = arguments[1] || '.'
+      @dest = arguments[1] || '.' # TODO: strip leading /
+      abort "Destination #{@dest} is not a directory." unless File.directory?(@dest)
       abort 'Project name required (core | <project>).' if arguments.empty?
-      print "Destination '#{@dest}' is not empty, are you sure you want continue installation? (yes|no): " unless destination_empty?
-      confirmation = STDIN.gets unless destination_empty?
-      abort 'Installation aborted.' unless confirmation =~ /y|yes/ 
       check_core
-      install_project if project_exists?
+      install_project
     end
     
     def debug(message)
@@ -30,14 +29,6 @@ class Drupal
       @project = 'drupal' if @project =~ /^core|drupal$/
     end
     
-    # Determine if the project passed actually exists as a module.
-    def project_exists?
-      debug 'Locating project page'
-      if !uri_available?("http://drupal.org/project/#{@project}")
-        abort "Failed to find #{@project}."
-      end
-    end
-    
     # Check if a uri is available.
     def uri_available?(uri)
       open(uri) rescue false
@@ -45,11 +36,45 @@ class Drupal
     
     # Install project.
     def install_project
-      debug "Located #{@project} page"
-      @markup = open("http://drupal.org/project/#{@project}") { |f| f.read } 
-      @markup.match /#{@project}-6\.x-[\d]\.[\d](?:\.\d)?(?:-\w+)?\.tar\.gz/
-      # TODO: make sure markup works..
-      # TODO: make sure match works..
+      debug "Locating #{@project} page"
+      # Locate tarball from project page
+      begin 
+        response = Net::HTTP.get_response(URI.parse("http://drupal.org/project/#{@project}"))
+        @markup = response.body
+        # TODO: check 404
+        debug 'Located the project page'
+      rescue
+        puts 'Failed to request page'
+      end
+      @markup.match /(#{@project}-6(?:.*?)\.gz)/
+      @tarball = $1
+      @tarpath = File.expand_path("#{@dest}/#{@tarball}")
+      abort "Failed to find Drupal 6 tar of #{@project}" if @tarball.nil?
+      debug "Found tarball #{@tarball}"
+      
+      # Fetch tarball
+      begin
+        response = Net::HTTP.get_response(URI.parse("http://ftp.drupal.org/files/projects/#{@tarball}"))
+        File.open(@tarpath, 'w') do |f|
+          f.write response.body
+        end
+        debug "Copied tarball to #{@tarpath}"
+      rescue
+        abort "Failed to find #{@tarpath}"
+      end
+      
+      # Extract tarball
+      @pwd = File.dirname(__FILE__)
+      Dir.chdir File.dirname(@tarpath)
+      Kernel.system "tar -xf #{@tarpath}" rescue abort "Failed to extract #{@tarpath}"
+      Dir.chdir @pwd
+      
+      # Remove tarball
+      Kernel.system "rm #{@tarpath}" rescue abort "Failed to remove #{@tarpath}"
+      
+      # Installation complete
+      debug "Project installed to #{File.dirname(@tarpath)}" unless @dest == '.'
+      debug 'Installation complete'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: visionmedia-drupal
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - tj@vision-media.ca
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-29 00:00:00 -07:00
+date: 2008-10-03 00:00:00 -07:00
 default_executable: 
 dependencies: []