caterpillar 0.9.1 → 0.9.2

data/ChangeLog

@@ -1,3 +1,8 @@
+= 0.9.2
+  - fixed a problem with navigation; enhanced css
+  - deployment task
+
+
 = 0.9.1
 Released at 2008-12-18
   - task to install the Rails-portlet

data/generators/caterpillar/templates/stylesheets/caterpillar/caterpillar.css

@@ -11,6 +11,13 @@ filter:alpha(opacity=81);-moz-opacity:.81;opacity:.81;
 
 .caterpillar_navigation ul {
 list-style-type: none;
+margin: 4px;
+padding: 4px;
+}
+
+#caterpillar_categories {
+width: 100%;
+overflow: auto;
 }
 
 .cp_category {
@@ -26,9 +33,9 @@ background: white;
 .cp_portlets {
 float: break;
 overflow: hidden;
-margin: 0 40px 10px 40px;
+margin: 0 40px 10px 0px;
 border: 3px double green;
-padding: 5px;
+/* padding: 5px; */
 }
 
 .navlink {

data/lib/caterpillar.rb

@@ -5,7 +5,7 @@
 #++
 
 module Caterpillar
-  VERSION='0.9.1'
+  VERSION='0.9.2'
 end
 
 this_file = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__

data/lib/caterpillar/config.rb

@@ -28,6 +28,8 @@ module Caterpillar
 
     attr_accessor :routes
 
+    attr_accessor :warbler_conf
+
     # Sets sane defaults that are overridden in the config file.
     def initialize
       @rails_root  = File.expand_path(defined?(RAILS_ROOT) ? RAILS_ROOT : Dir.getwd)
@@ -36,6 +38,7 @@ module Caterpillar
       @instances = []
       @javascripts = []
       @include_all_named_routes = true
+      @warbler_conf = File.join(@rails_root,'config','warble.rb')
 
       yield self if block_given?
     end

data/lib/caterpillar/parser.rb

@@ -61,10 +61,6 @@ module Caterpillar
             routes.delete(r)
           end
         end
-        # fix path variables to be replaced by rails-portlet at runtime
-        path.gsub!(/:uid/,'%UID%')
-        path.gsub!(/:gid/,'%GID%')
-        # TODO: notify user of unsupported variables
         portlet.update( :path => path )
 
         ### javascripts
@@ -101,6 +97,13 @@ module Caterpillar
 
         ### javascripts
         portlet.update( :javascripts => @config.javascripts ) unless portlet[:javascripts]
+
+        # fix path variables to be replaced by rails-portlet at runtime
+        path = portlet[:path]
+        path.gsub!(/:uid/,'%UID%')
+        path.gsub!(/:gid/,'%GID%')
+        # TODO: notify user of unsupported variables
+        portlet.update( :path => path )
       end
 
       return portlets

data/lib/caterpillar/task.rb

@@ -42,13 +42,14 @@ module Caterpillar
       @name   = name
       @config = Util.eval_configuration(config)
       yield self if block_given?
+      @xml_files = []
       send tasks
     end
 
     private
 
     def define_tasks
-      define_main_task
+      define_xml_task
       define_usage_task
       define_pluginize_task
       define_environment_task
@@ -64,10 +65,15 @@ module Caterpillar
       define_jar_install_task
       define_jar_uninstall_task
       define_jar_version_task
+      define_warble_task
+      define_deploy_task
+      define_deploy_xml_task
+      define_deploy_war_task
     end
 
     # the main XML generator task
-    def define_main_task
+    def define_xml_task
+      @name = :xml
       desc 'Create all XML files according to configuration'
       tasks = [:parse,"#{@name}:portlet"]
       if @config.container.kind_of? Liferay
@@ -164,6 +170,7 @@ module Caterpillar
       else
         file = 'portlet.xml'
       end
+      @xml_files << file
       with_namespace_and_config do |name, config|
         desc 'Create JSR286 portlet XML'
         task :portlet do
@@ -180,6 +187,7 @@ module Caterpillar
     def define_liferayportletappxml_task
       @name = :xml
       file = 'liferay-portlet-ext.xml'
+      @xml_files << file
       with_namespace_and_config do |name, config|
         desc 'Create Liferay portlet XML'
         task :liferayportletapp do
@@ -196,6 +204,7 @@ module Caterpillar
     def define_liferaydisplayxml_task
       @name = :xml
       file = 'liferay-display.xml'
+      @xml_files << file
       with_namespace_and_config do |name, config|
         desc 'Create Liferay display XML'
         task :liferaydisplay do
@@ -351,6 +360,79 @@ module Caterpillar
       end
     end
 
+
+
+    def define_warble_task
+      desc 'Create a WAR package with Warbler'
+      task :warble do
+        unless system('which warble')
+          info 'Warbler was not found in PATH, exiting'
+          exit 1
+        end
+        unless File.exists?(@config.warbler_conf)
+          info 'Warbler configuration file %s was not found, exiting' % @config.warbler_conf
+          exit 1
+        end
+        info 'building WAR package'
+
+        system('ruby -S warble war')
+
+        unless File.exists?(@config.servlet+'.war')
+          info 'cannot find the WAR file, exiting'
+          exit 1
+        end
+      end
+    end
+
+    def define_deploy_task
+      desc 'Deploy XML files and WAR package to the portlet container'
+
+      raise 'Only deployment to Liferay on Tomcat is supported' unless @config.container.kind_of? Liferay
+      tasks = [:xml, :warble, 'deploy:xml', 'deploy:war']
+      task :deploy => tasks
+    end
+
+    def define_deploy_xml_task
+      @name = :deploy
+      with_namespace_and_config do |name, config|
+        desc 'Deploys the XML files'
+        task :xml do
+          info 'deploying XML files'
+          target = @config.container.WEB_INF
+
+          @xml_files.each do |file|
+            system('cp %s %s' % [file,target])
+            info 'copied %s into %s' % [file,target]
+          end
+        end
+      end
+    end
+    def define_deploy_war_task
+      @name = :deploy
+      with_namespace_and_config do |name, config|
+        desc 'Deploys the WAR file'
+        task :war do
+          info 'deploying WAR package'
+
+          file = @config.servlet+'.war'
+          unless File.exists?(file)
+            info 'cannot find the WAR file %s, exiting' % file
+            exit 1
+          end
+
+          target = File.join(@config.container.root,'webapps')
+          info 'removing previous installs'
+          system('rm -rf %s' % File.join(target,@config.servlet+'*'))
+          system('cp %s %s' % [file,target])
+          info 'copied %s into %s' % [file,target]
+
+        end
+      end
+    end
+
+
+
+
     def with_namespace_and_config
       name, config = @name, @config
       namespace name do

data/views/caterpillar/_navigation.html.erb

@@ -1,15 +1,17 @@
 <div class="caterpillar_navigation">
   <%# CATEGORIES -%>
-  <% categories = @caterpillar_navigation.keys -%>
-  <% @caterpillar_navigation.each_pair do |category,portlets| -%>
-    <% cat = category.gsub(' ','_') -%>
-    <span id="<%=cat-%>" class="cp_category">
-      <%= link_to_function( category,
-        "cp_toggle_category('%s',null);" % cat
-    )
-    -%>
-    </span>
-  <% end -%>
+  <%# categories = @caterpillar_navigation.keys -%>
+  <div id="caterpillar_categories">
+    <% @caterpillar_navigation.each_pair do |category,portlets| -%>
+      <% cat = category.gsub(' ','_') -%>
+      <span id="<%=cat-%>" class="cp_category">
+        <%= link_to_function( category,
+          "cp_toggle_category('%s',null);" % cat
+      )
+      -%>
+      </span>
+    <% end -%>
+  </div>
 
   <%# PORTLET LINKS -%>
   <% @caterpillar_navigation.each_pair do |category,portlets| -%>
@@ -34,7 +36,7 @@
              end
         -%>
           <li>
-            <b><%= link_to( portlet[:title], portlet[:reqs]+vars ) -%></b>
+            <b><%= link_to( portlet[:title], portlet[:reqs].merge(vars) ) -%></b>
             <i>needs variables</i> <b><%= vars.keys.inspect -%></b>
           </li>
         <% end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: caterpillar
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Mikael Lammentausta
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-18 00:00:00 +02:00
+date: 2008-12-19 00:00:00 +02:00
 default_executable: caterpillar
 dependencies: 
 - !ruby/object:Gem::Dependency