berkes-drupal.rb 0.0.8 → 0.0.9

data/README.txt

@@ -71,14 +71,16 @@ to quickly generate and manage Drupal modules.
   Alternatively you can copy the example from the doc dir in the package. 
 	
 == TODO:
+  * Move module, install to base too.
+  * Add support for database scheme upgrades, similar to rake db: commands. Should add hook_update to .install.
   * Move helptext into one include instead of having it on 4 places (DRY!)
-  * Add Drupal version support to defaults.yml.
+  * Improve Drupal version support to defaults.yml.
   * Remove ':' from todo list items
-  * Add formatted help option
   * Support versions for installer
   * Support version prompt for project installation
   * Support installing a list from file(s) so that devs may have lists of core modules they use
   * Add hook dependencies
+  * Add an option to write and/or change defaults.yml from commandline
   * Add installer for jQuery plugins?
   * Add graceful error handling
   * Add / refactor tests, using rspec

data/drupal.rb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "drupal.rb"
-  s.version  = "0.0.8"
+  s.version  = "0.0.9"
   s.date     = "2008-10-16"
   s.summary  = "Drupal development kit"
   s.email    = "ber@webschuur.com"
@@ -18,20 +18,35 @@ Gem::Specification.new do |s|
 		"lib/drupal/create_module.rb", 
 		"lib/drupal/todo_list.rb", 
 		"lib/drupal/install.rb", 
-		"lib/drupal/templates/comments/file", 
-		"lib/drupal/templates/comments/large", 
-		"lib/drupal/templates/hooks/block", 
-		"lib/drupal/templates/hooks/boot", 
-		"lib/drupal/templates/hooks/install", 
-		"lib/drupal/templates/hooks/cron", 
-		"lib/drupal/templates/hooks/form_alter", 
-		"lib/drupal/templates/hooks/init", 
-		"lib/drupal/templates/hooks/menu", 
-		"lib/drupal/templates/hooks/perm", 
-		"lib/drupal/templates/hooks/schema", 
-		"lib/drupal/templates/hooks/theme", 
-		"lib/drupal/templates/txt/changelog", 
-		"lib/drupal/templates/txt/readme", 
+		"lib/drupal/templates/6.x/comments/file", 
+		"lib/drupal/templates/6.x/comments/large", 
+		"lib/drupal/templates/6.x/hooks/block", 
+		"lib/drupal/templates/6.x/hooks/boot", 
+		"lib/drupal/templates/6.x/hooks/install", 
+		"lib/drupal/templates/6.x/hooks/cron", 
+		"lib/drupal/templates/6.x/hooks/form_alter", 
+		"lib/drupal/templates/6.x/hooks/init", 
+		"lib/drupal/templates/6.x/hooks/menu", 
+		"lib/drupal/templates/6.x/hooks/perm", 
+		"lib/drupal/templates/6.x/hooks/schema", 
+		"lib/drupal/templates/6.x/hooks/theme", 
+		"lib/drupal/templates/6.x/txt/changelog", 
+		"lib/drupal/templates/6.x/txt/readme",
+		"lib/drupal/templates/6.x/base/info",
+		
+		"lib/drupal/templates/5.x/comments/file", 
+		"lib/drupal/templates/5.x/comments/large", 
+		"lib/drupal/templates/5.x/hooks/block", 
+		"lib/drupal/templates/5.x/hooks/install", 
+		"lib/drupal/templates/5.x/hooks/cron", 
+		"lib/drupal/templates/5.x/hooks/form_alter", 
+		"lib/drupal/templates/5.x/hooks/init", 
+		"lib/drupal/templates/5.x/hooks/menu", 
+		"lib/drupal/templates/5.x/hooks/perm",
+		"lib/drupal/templates/5.x/txt/changelog", 
+		"lib/drupal/templates/5.x/txt/readme",
+		"lib/drupal/templates/5.x/base/info",
+		
 		"bin/drupal"]
 	s.executables = ["drupal"]
   s.test_files = ["test/test_drupal.rb", "test/test_install.rb", "test/test_create_module.rb", "test/test_todo_list.rb"]

data/lib/drupal/create_module.rb

@@ -27,7 +27,8 @@ class Drupal
       # TODO create self.log() with padding to even output
       defaults = get_defaults
 
-      # Info
+      # TODO make each ask have a commandline-option equivalent.
+      @version = self.ask('What drupal version to scaffold for?:', defaults[:version])
       @author = self.ask('What is your name?:', defaults[:author])
       @link = self.ask('What is the URI to your companies website?:', defaults[:link])
       @email = self.ask('What is your email?:', defaults[:email])
@@ -131,14 +132,26 @@ class Drupal
 
     # Create info file.
     def create_module_info_file
-      contents = '; $Id$'
-      contents << "\nname = #{@module_name}"
-      contents << "\ndescription = #{@module_description}"
-      contents << "\ncore = 6.x"
-      @module_dependencies.each do |dependency|
-        contents << "\ndependencies[] = #{dependency}"
+      tokens = {
+        'module_name' => @module_name,
+        'module_description' => @module_description,
+        'version' => @version,
+      }
+
+      if !@module_dependencies.nil?
+        #In 6.x each dep has a new line. In 5.x they are on a single line.
+        if (@version == '6.x')
+          @module_dependencies.each do |dependency|
+           tokens['dependencies_chunk'] = "\ndependencies[] = #{dependency}"
+          end       
+        elsif (@version == '5.x')
+          tokens['dependencies_chunk'] = "dependencies = " + @module_dependencies.join(',')
+        end
       end
-      create_file("#{@module}.info", contents)
+      
+      filepath = "#{@module}.info"
+      create_file(filepath)
+      append_template(filepath, "base/info", tokens)
     end
 
     # Create a new directory.
@@ -213,10 +226,10 @@ class Drupal
 
     private
     def get_template_location
-      location = File.expand_path '~/.drupal.rb/templates'
+      location = File.expand_path "~/.drupal.rb/templates/#{@version}"
 
       unless File.directory? location
-        location = File.dirname(__FILE__) + '/templates'
+        location = File.dirname(__FILE__) + "/templates/#{@version}"
       end
 
       return location + '/'

data/lib/drupal/install.rb

@@ -84,7 +84,7 @@ class Drupal
           raise message
         end
       rescue
-        debug "Could not fetch #{project}. Error: #{message}"
+        abort "Could not fetch #{project}. Error: #{message}"
       end
 
       return xmldoc

data/lib/drupal/templates/5.x/base/info

@@ -0,0 +1,6 @@
+; $Id$'
+
+name = [module_name]
+description = [module_description]
+core = [version]
+[dependencies_chunk]

data/lib/drupal/templates/{hooks → 5.x/hooks}/block

@@ -7,9 +7,8 @@ function [module]_block($op = 'list', $delta = 0, $edit = array()) {
     case 'list':
       $blocks = array();
       $blocks[0] = array(
-          'info' => t('Block desc in listing'),
-          'cache' => BLOCK_CACHE_PER_ROLE | BLOCK_CACHE_PER_PAGE,
-        );
+        'info' => t('Block desc in listing'),
+      );
       return $blocks;
 
     case 'configure':
@@ -17,10 +16,10 @@ function [module]_block($op = 'list', $delta = 0, $edit = array()) {
       switch($delta){
         default:
           $form['item'] = array(
-              '#type' => 'textfield',
-              '#title' => t('Form Item'),
-              '#default_value' => variable_get('item_var', 0),
-            );
+            '#type' => 'textfield',
+            '#title' => t('Form Item'),
+            '#default_value' => variable_get('item_var', 0),
+          );
       }
       return $form;
 
@@ -36,9 +35,9 @@ function [module]_block($op = 'list', $delta = 0, $edit = array()) {
       switch($delta) {
         case 0:
           $block = array(
-              'subject' => t('Block title'),
-              'content' => 'content here',
-            );
+            'subject' => t('Block title'),
+            'content' => 'content here',
+          );
       }
       return $block;
   }

data/lib/drupal/templates/5.x/hooks/form_alter

@@ -0,0 +1,11 @@
+
+/**
+ * Implementation of hook_form_alter().
+ */
+function [module]_form_alter($form_id, &$form) {
+  switch($form_id) {
+    case '':
+      // @todo: do something
+      break;
+  }
+}

data/lib/drupal/templates/5.x/hooks/install

@@ -0,0 +1,15 @@
+
+/**
+ * Implementation of hook_install().
+ */
+function [module]_install() {
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+      db_query();
+      break;
+    default:
+      drupal_set_message(t('Database type %dbtype is currently not supported. Please create database table manually.', array('%dbtype' => $GLOBALS['db_type'])), 'error');
+      break;
+  }
+}

data/lib/drupal/templates/5.x/hooks/menu

@@ -0,0 +1,24 @@
+
+/**
+ * Implementation of hook_menu().
+ */
+function [module]_menu($may_cache) {
+  $items = array();
+
+  if ($may_cache) {
+    $items[] = array(
+      'path' => 'admin/settings/[module]',
+      'title' => t('[module]'),
+      'callback' => '[module]_settings_page',
+      'access' => user_access('access administration pages'),
+    );
+    $items[] = array(
+      'path' => '',
+      'title' => t(''),
+      'callback' => '',
+      'access' => user_access(''),
+      'type' => MENU_SUGGESTED_ITEM,
+    );
+  }
+  return $items;
+}

data/lib/drupal/templates/5.x/hooks/perm

@@ -0,0 +1,7 @@
+
+/**
+ * Implementation of hook_perm().
+ */
+function [module]_perm() {
+  return array('');
+}

data/lib/drupal/templates/6.x/base/info

@@ -0,0 +1,6 @@
+; $Id$'
+
+name = [module_name]
+description = [module_description]
+core = [version]
+[dependencies_chunk]

data/lib/drupal/templates/6.x/comments/file

@@ -0,0 +1,9 @@
+// $Id$
+
+/**
+ * @file
+ * [module_description]
+ * @author [author] <[email]>
+ * @link [link]
+ * @package [module]
+ */

data/lib/drupal/templates/6.x/comments/large

@@ -0,0 +1,6 @@
+
+/* -----------------------------------------------------------------
+
+  [title]
+
+------------------------------------------------------------------ */

data/lib/drupal/templates/6.x/hooks/block

@@ -0,0 +1,45 @@
+
+/**
+ * Implementation of hook_block().
+ */
+function [module]_block($op = 'list', $delta = 0, $edit = array()) {
+  switch($op) {
+    case 'list':
+      $blocks = array();
+      $blocks[0] = array(
+        'info' => t('Block desc in listing'),
+        'cache' => BLOCK_CACHE_PER_ROLE | BLOCK_CACHE_PER_PAGE,
+      );
+      return $blocks;
+
+    case 'configure':
+      $form = array();
+      switch($delta){
+        default:
+          $form['item'] = array(
+            '#type' => 'textfield',
+            '#title' => t('Form Item'),
+            '#default_value' => variable_get('item_var', 0),
+          );
+      }
+      return $form;
+
+    case 'save':
+      switch($delta){
+        default:
+          variable_set('item_var', $edit['item_var']);
+      }
+      break;
+
+    case 'view':
+      $block = array();
+      switch($delta) {
+        case 0:
+          $block = array(
+            'subject' => t('Block title'),
+            'content' => 'content here',
+          );
+      }
+      return $block;
+  }
+}

data/lib/drupal/templates/6.x/hooks/cron

@@ -0,0 +1,7 @@
+
+/**
+ * Implementation of hook_cron().
+ */
+function [module]_cron() {
+
+}

data/lib/drupal/templates/6.x/hooks/init

@@ -0,0 +1,7 @@
+
+/**
+ * Implementation of hook_init().
+ */
+function [module]_init() {
+
+}

data/lib/drupal/templates/6.x/hooks/menu

@@ -0,0 +1,17 @@
+
+/**
+ * Implementation of hook_menu().
+ */
+function [module]_menu() {
+  $items = array();
+
+  $items['admin/settings/[module]'] = array(
+    'title' => '[module]',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('[module]_settings'),
+    'access arguments' => array('administer [module]'),
+    'file' => '[module].admin.inc',
+  );
+
+  return $items;
+}

data/lib/drupal/templates/6.x/txt/changelog

@@ -0,0 +1,9 @@
+
+        $Id$
+
+
+        -------------------------------------------------------------------------------
+        [module] 6.4-1.0, YYYY-MM-DD
+        -------------------------------------------------------------------------------
+
+        - Initial release

data/lib/drupal/templates/6.x/txt/readme

@@ -0,0 +1,36 @@
+
+        $Id$
+
+
+        [module]
+        Provided by [link]
+        Developed by [author]
+
+        -------------------------------------------------------------------------------
+        INSTALLATION
+        -------------------------------------------------------------------------------
+
+        todo
+
+        -------------------------------------------------------------------------------
+        PERMISSIONS
+        -------------------------------------------------------------------------------
+
+        permission
+          - description
+
+
+        -------------------------------------------------------------------------------
+        PUBLIC API
+        -------------------------------------------------------------------------------
+
+        todo
+
+        -------------------------------------------------------------------------------
+        CONVENTIONS
+        -------------------------------------------------------------------------------
+
+        todo
+
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: berkes-drupal.rb
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - tj@vision-media.ca
@@ -34,20 +34,33 @@ files:
 - lib/drupal/create_module.rb
 - lib/drupal/todo_list.rb
 - lib/drupal/install.rb
-- lib/drupal/templates/comments/file
-- lib/drupal/templates/comments/large
-- lib/drupal/templates/hooks/block
-- lib/drupal/templates/hooks/boot
-- lib/drupal/templates/hooks/install
-- lib/drupal/templates/hooks/cron
-- lib/drupal/templates/hooks/form_alter
-- lib/drupal/templates/hooks/init
-- lib/drupal/templates/hooks/menu
-- lib/drupal/templates/hooks/perm
-- lib/drupal/templates/hooks/schema
-- lib/drupal/templates/hooks/theme
-- lib/drupal/templates/txt/changelog
-- lib/drupal/templates/txt/readme
+- lib/drupal/templates/6.x/comments/file
+- lib/drupal/templates/6.x/comments/large
+- lib/drupal/templates/6.x/hooks/block
+- lib/drupal/templates/6.x/hooks/boot
+- lib/drupal/templates/6.x/hooks/install
+- lib/drupal/templates/6.x/hooks/cron
+- lib/drupal/templates/6.x/hooks/form_alter
+- lib/drupal/templates/6.x/hooks/init
+- lib/drupal/templates/6.x/hooks/menu
+- lib/drupal/templates/6.x/hooks/perm
+- lib/drupal/templates/6.x/hooks/schema
+- lib/drupal/templates/6.x/hooks/theme
+- lib/drupal/templates/6.x/txt/changelog
+- lib/drupal/templates/6.x/txt/readme
+- lib/drupal/templates/6.x/base/info
+- lib/drupal/templates/5.x/comments/file
+- lib/drupal/templates/5.x/comments/large
+- lib/drupal/templates/5.x/hooks/block
+- lib/drupal/templates/5.x/hooks/install
+- lib/drupal/templates/5.x/hooks/cron
+- lib/drupal/templates/5.x/hooks/form_alter
+- lib/drupal/templates/5.x/hooks/init
+- lib/drupal/templates/5.x/hooks/menu
+- lib/drupal/templates/5.x/hooks/perm
+- lib/drupal/templates/5.x/txt/changelog
+- lib/drupal/templates/5.x/txt/readme
+- lib/drupal/templates/5.x/base/info
 - bin/drupal
 has_rdoc: true
 homepage: http://berkes.github.com/drupal.rb/

data/lib/drupal/templates/hooks/menu

@@ -1,17 +0,0 @@
-
-/**
- * Implementation of hook_menu().
- */
-function [module]_menu() {
-  $items = array();
-
-  $items['admin/settings/[module]'] = array(
-      'title' => '[module]',
-      'page callback' => 'drupal_get_form',
-      'page arguments' => array('[module]_settings'),
-      'access arguments' => array('administer [module]'),
-      'file' => '[module].admin.inc',
-    );
-
-  return $items;
-}