circus-deployment 0.0.1 → 0.2

data/lib/circus/profiles/make_base.rb

@@ -10,7 +10,10 @@ module Circus
 
       def prepare_for_deploy(logger, overlay_dir)
         # Build the application
-        run_external(logger, 'Compile application', "cd #{@dir}; make")
+        if File.exists?(File.join(@dir, 'Makefile'))
+          logger.info("Compiling #{@name}")
+          run_external(logger, 'Compile application', "cd #{@dir}; make")
+        end
       end
     end
   end

data/lib/circus/profiles/maven_webapp.rb

@@ -0,0 +1,117 @@
+require 'rexml/document'
+require 'erb'
+
+module Circus
+  module Profiles
+    class MavenWebApp < Base
+      MAVEN_WEBAPP_PROPERTY='maven-webapp'
+      
+      # Checks if this is a shell applcation. Will accept the application if it 
+      # has a file named <name>.sh, or has a 'shell-app' property describing the entry point.
+      def self.accepts?(name, dir, props)
+        pom_path = File.join(dir, "pom.xml")
+        
+        return true if props.include? MAVEN_WEBAPP_PROPERTY
+        return false unless File.exists?(pom_path)
+        
+        pom_content = REXML::Document.new(File.new(pom_path))
+        packaging_el = pom_content.root.elements['packaging']
+        return false unless packaging_el
+        
+        packaging_el.text.strip == 'war'
+      end
+      
+      attr_reader :app_final_name
+      
+      def initialize(name, dir, props)
+        super(name, dir, props)
+        
+        @app_final_name = props[MAVEN_WEBAPP_PROPERTY] || detect_app_name
+      end
+      
+      # The name of this profile
+      def name
+        "maven-war"
+      end
+      
+      def dev_run_script_content
+        shell_run_script do
+          <<-EOT
+          cd #{@dir}
+          exec mvn jetty:run
+          EOT
+        end
+      end
+
+      def prepare_for_deploy(logger, overlay_dir)
+        # Build the maven package, then copy the output into the overlay directory
+        logger.info("Building maven application #{@name}")
+        return false unless run_external(logger, 'Perform maven packaging', "cd #{@dir}; mvn package -Dmaven.test.skip=true")
+        
+        logger.info("Expanding artifact #{app_final_name}.war")
+        final_full_path = File.expand_path("target/#{app_final_name}.war")
+        return false unless run_external(logger, 
+          'Expand application artifact', 
+          "mkdir #{overlay_dir}/#{@name} && unzip #{@dir}/target/#{app_final_name}.war -d #{overlay_dir}/#{@name}/")
+        
+        logger.info("Generating configuration files for #{@name}")
+        write_template('maven_webapp_jetty.xml.erb', "#{overlay_dir}/jetty.xml")
+        write_template('maven_webapp_jetty_app.xml.erb', "#{overlay_dir}/jetty-app.xml")
+        File.open("#{overlay_dir}/jetty.properties", 'w') do |f|
+          f << "jetty.home=/opt/jetty-7.1"
+        end
+        
+        true
+      end
+
+      def deploy_run_script_content
+        shell_run_script do
+          <<-EOT
+          exec java -jar /opt/jetty-7.1/start.jar -Djetty.home=/opt/jetty-7.1 OPTIONS=Server,plus,jndi `pwd`/jetty.properties `pwd`/jetty.xml  `pwd`/jetty-app.xml
+          EOT
+        end
+      end
+      
+      def package_base_dir?
+        false
+      end
+      
+      private
+        def listen_port
+          @props['web-app-port'] || 8130
+        end
+        
+        def amqp_connection_factories
+          @props['amqp-connections'] || []
+        end
+        def datasources
+          @props['datasources'] || []
+        end
+        def env_entries
+          @props['env-entries'] || []
+        end
+      
+        def detect_app_name
+          effective_pom_path = "/tmp/#{name}-effective.pom"
+          `cd #{@dir}; mvn help:effective-pom -Doutput=#{effective_pom_path}`
+          unless $? == 0
+            raise "Failed to determine effective pom for maven webapp act #{name}"
+          end
+          
+          pom_content = REXML::Document.new(File.new(effective_pom_path))
+          pom_content.root.elements['build/finalName'].text.strip
+        end
+        
+        def write_template(template_name, out_name)
+          template_path = File.expand_path("../#{template_name}", __FILE__)
+          template_erb = ERB.new(File.read template_path)
+          template_erb.filename = template_path
+          File.open(out_name, 'w') do |f|
+            f.write(template_erb.result(binding))
+          end
+        end
+    end
+    
+    PROFILES << MavenWebApp
+  end
+end

data/lib/circus/profiles/maven_webapp_jetty.xml.erb

@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+
+<!-- =============================================================== -->
+<!-- Configure the Jetty Server                                      -->
+<!--                                                                 -->
+<!-- Documentation of this file format can be found at:              -->
+<!-- http://wiki.eclipse.org/Jetty/Reference/jetty.xml_syntax        -->
+<!--                                                                 -->
+<!-- Additional configuration files are available in $JETTY_HOME/etc -->
+<!-- and can be mixed in.  For example:                              -->
+<!--   java -jar start.jar etc/jetty.xml etc/jetty-ssl.xml           -->
+<!--                                                                 -->
+<!-- See start.ini file for the default configuraton files           -->
+<!-- =============================================================== -->
+
+
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+  <!-- =========================================================== -->
+  <!-- Server Thread Pool                                          -->
+  <!-- =========================================================== -->
+  <Set name="ThreadPool">
+    <!-- Default queued blocking threadpool -->
+    <New class="org.eclipse.jetty.util.thread.QueuedThreadPool">
+      <Set name="minThreads">10</Set>
+      <Set name="maxThreads">200</Set>
+    </New>
+  </Set>
+
+  <!-- =========================================================== -->
+  <!-- Set connectors                                              -->
+  <!-- =========================================================== -->
+
+  <Call name="addConnector">
+    <Arg>
+        <New class="org.eclipse.jetty.server.nio.SelectChannelConnector">
+          <Set name="host"><Property name="jetty.host" /></Set>
+          <Set name="port"><%= listen_port %></Set>
+          <Set name="maxIdleTime">300000</Set>
+          <Set name="Acceptors">2</Set>
+          <Set name="statsOn">false</Set>
+          <!-- <Set name="confidentialPort">8443</Set> -->
+    	    <Set name="lowResourcesConnections">20000</Set>
+    	    <Set name="lowResourcesMaxIdleTime">5000</Set>
+        </New>
+    </Arg>
+  </Call>
+
+  <!-- =========================================================== -->
+  <!-- Set handler Collection Structure                            --> 
+  <!-- =========================================================== -->
+  <Set name="handler">
+    <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
+      <Set name="handlers">
+       <Array type="org.eclipse.jetty.server.Handler">
+         <Item>
+           <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
+         </Item>
+         <Item>
+           <New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
+         </Item>
+       </Array>
+      </Set>
+    </New>
+  </Set>
+
+  <!-- =========================================================== -->
+  <!-- extra options                                               -->
+  <!-- =========================================================== -->
+  <Set name="stopAtShutdown">true</Set>
+  <Set name="sendServerVersion">true</Set>
+  <Set name="sendDateHeader">true</Set>
+  <Set name="gracefulShutdown">1000</Set>
+</Configure>

data/lib/circus/profiles/maven_webapp_jetty_app.xml.erb

@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+  <New class="org.eclipse.jetty.webapp.WebAppContext">
+    <Arg><Ref id="Contexts"/></Arg>
+    <Arg><%= @name %></Arg>
+    <Arg>/</Arg>
+    
+    <Set name="ConfigurationClasses">
+      <Array type="java.lang.String">
+        <Item>org.eclipse.jetty.webapp.WebInfConfiguration</Item>
+        <Item>org.eclipse.jetty.webapp.WebXmlConfiguration</Item>
+        <Item>org.eclipse.jetty.webapp.MetaInfConfiguration</Item>
+        <Item>org.eclipse.jetty.webapp.FragmentConfiguration</Item>
+        <Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item>
+        <Item>org.eclipse.jetty.plus.webapp.Configuration</Item>
+        <Item>org.eclipse.jetty.webapp.JettyWebXmlConfiguration</Item>
+        <Item>org.eclipse.jetty.webapp.TagLibConfiguration</Item>
+      </Array>
+    </Set>
+    
+    <% amqp_connection_factories.each do |cf| %>
+      <New class="org.eclipse.jetty.plus.jndi.Resource">
+        <Arg></Arg>
+        <Arg><%= cf['name'] %></Arg>
+        <Arg>
+          <New class="com.rabbitmq.client.ConnectionFactory">
+            <Set name="host"><%= cf['host'] %></Set>
+          </New>
+        </Arg>
+      </New>
+    <% end %>
+    
+    <% datasources.each do |ds| %>
+      <New class="org.eclipse.jetty.plus.jndi.Resource">
+        <Arg></Arg>
+        <Arg><%= ds['name'] %></Arg>
+        <Arg>
+          <New class="org.apache.commons.dbcp.BasicDataSource">
+            <Set name="driverClassName">org.postgresql.Driver</Set>
+            <Set name="url">jdbc:postgresql://localhost/<%= ds['db_name'] %>?user=<%= ds['db_user'] %>&amp;password=<%= ds['db_password'] %></Set>
+          </New>
+        </Arg>
+      </New>
+    <% end %>
+
+    <% env_entries.each do |ee| %>
+      <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
+        <Arg></Arg>
+        <Arg><%= ee['name'] %></Arg>
+        <Arg type="<%= ee['type'] %>"><%= ee['value']%></Arg>
+        <Arg type="boolean">true</Arg>
+      </New>
+    <% end %>
+  </New>
+</Configure>

data/lib/circus/profiles/python_base.rb

@@ -10,11 +10,11 @@ module Circus
 
       def prepare_for_deploy(logger, overlay_dir)
         # Build the virtualenv
-        if has_depsfile?
-          unless File.exists? "#{@dir}/vendor"
-            return false unless run_external(logger, "Create virtualenv", "cd #{@dir}; virtualenv --no-site-packages vendor")
-          end
+        unless File.exists? "#{@dir}/vendor"
+          return false unless run_external(logger, "Create virtualenv", "cd #{@dir}; virtualenv --no-site-packages vendor")
+        end
 
+        if has_depsfile?
           File.read(depsfile_fn).lines.each do |dep|
             return false unless run_external(logger, "Install dep #{dep}", 
                 "cd #{@dir}; vendor/bin/easy_install -q \"#{dep.strip}\"")
@@ -36,4 +36,4 @@ module Circus
         end
     end
   end
-end
+end

data/lib/circus/profiles/rack.rb

@@ -35,17 +35,21 @@ module Circus
       def deploy_run_script_content
         shell_run_script do
           <<-EOT
-          exec bundle exec vendor/bin/thin -R #{@rackup_name} -p #{listen_port} start
+          exec bundle exec thin -R #{@rackup_name} -p #{listen_port} start
           EOT
         end
       end
       
-      def extra_dirs
-        if has_gemfile?
-          ["#{@dir}/.bundle"]
-        else
-          []
-        end
+      # Describes the requirements of the deployed application. Rack applications automatically
+      # have an environment system property applied for RACK_ENV and RAILS_ENV
+      def requirements
+        res = super
+
+        res['system-properties'] ||= {}
+        res['system-properties']['RACK_ENV'] = 'production'
+        res['system-properties']['RAILS_ENV'] = 'production'
+        
+        res
       end
       
       private

data/lib/circus/profiles/ruby_base.rb

@@ -5,21 +5,30 @@ require 'bundler/circus_util'
 module Circus
   module Profiles
     class RubyBase < Base
-      BUNDLER_TOOL=File.expand_path('../../../bundler/circus_bundler.rb', __FILE__)
+      BUNDLER_TOOL=File.expand_path('../../../bundler/gem_cacher.rb', __FILE__)
       
       def initialize(name, dir, props)
         super(name, dir, props)
       end
 
-      # No dev preparation required. Don't override dev_run_script_content, since it is the
+      # Do basic gemfile preparation for dev. Don't override dev_run_script_content, since it is the
       # same as the deployment variant.
-      def prepare_for_dev(logger, run_dir); true; end
+      def prepare_for_dev(logger, run_dir)
+        if has_gemfile?
+            # TODO: Correct behaviour if working in the presence of an existing bundler environment
+          run_external(logger, 'gem installation', "cd #{@dir}; bundle check || bundle install")
+        end
+        
+        true
+      end
 
       def prepare_for_deploy(logger, overlay_dir)
         # Run the gem bundler if necessary
         if has_gemfile?
           logger.info("Bundling gems")
-          run_external(logger, 'gem bundling', "cd #{@dir}; ruby #{BUNDLER_TOOL}")
+          return false unless run_external(logger, 'gem installation', "cd #{@dir}; bundle install")
+          return false unless run_external(logger, 'gem caching', 
+              "cd #{@dir}; ruby #{BUNDLER_TOOL} && rm Gemfile.lock && bundle install vendor/bundle")
         end
         
         true

data/lib/circus/repos/git.rb

@@ -29,7 +29,8 @@ module Circus
       end
       
       def current_revision
-        `(cd #{@dir}; git rev-parse HEAD)`.strip
+        result = `(cd #{@dir}; git rev-parse HEAD)`
+        return result.strip unless $?.exitstatus != 0
       end
       
       def write_patch(patch_fn)

data/lib/circus/version.rb

@@ -1,3 +1,3 @@
 module Circus
-  VERSION = "0.0.1"
+  VERSION = "0.2"
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: circus-deployment
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Paul Jones
@@ -14,16 +14,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-20 00:00:00 +01:00
+date: 2010-11-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +35,11 @@ dependencies:
   name: thor
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 35
         segments: 
         - 0
         - 13
@@ -47,9 +51,11 @@ dependencies:
   name: uuid
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 2
         - 0
@@ -61,9 +67,11 @@ dependencies:
   name: net-ssh
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 35
         segments: 
         - 2
         - 0
@@ -75,9 +83,11 @@ dependencies:
   name: net-scp
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 0
@@ -85,6 +95,22 @@ dependencies:
         version: 1.0.2
   type: :runtime
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: json_pure
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 4
+        - 6
+        version: 1.4.6
+  type: :runtime
+  version_requirements: *id006
 description: Circus provides the ability to deploy multi-component applications easily
 email: 
 - pauljones23@gmail.com
@@ -96,96 +122,100 @@ extra_rdoc_files: []
 
 files: 
 - bin/circus
-- lib/circus/act.rb
-- lib/circus/clown_client.rb
-- lib/circus/actstore_client.rb
-- lib/circus/external_util.rb
-- lib/circus/profiles/shell.rb
-- lib/circus/profiles/django.rb
-- lib/circus/profiles/jekyll.rb
-- lib/circus/profiles/make_base.rb
-- lib/circus/profiles/rack.rb
-- lib/circus/profiles/ruby_base.rb
-- lib/circus/profiles/pure_py.rb
-- lib/circus/profiles/python_base.rb
-- lib/circus/profiles/pure_rb.rb
-- lib/circus/profiles/base.rb
-- lib/circus/local_config.rb
-- lib/circus/connection_builder.rb
+- lib/bundler/patches.rb
+- lib/bundler/circus_util.rb
+- lib/bundler/circus_bundler.rb
+- lib/bundler/gem_cacher.rb
+- lib/circus/application.rb
 - lib/circus/stdout_logger.rb
-- lib/circus/resource_allocator_client.rb
-- lib/circus/repos/mercurial.rb
-- lib/circus/repos/git.rb
-- lib/circus/agents/dbus_connection.rb
+- lib/circus/actstore_client.rb
+- lib/circus/clown_client.rb
+- lib/circus/processes/daemontools.rb
+- lib/circus/act.rb
 - lib/circus/agents/dbus_logger.rb
-- lib/circus/agents/client.rb
-- lib/circus/agents/agent.rb
+- lib/circus/agents/conversation.rb
+- lib/circus/agents/dbus_connection.rb
 - lib/circus/agents/encoding.rb
 - lib/circus/agents/params.rb
 - lib/circus/agents/connection.rb
+- lib/circus/agents/client.rb
 - lib/circus/agents/ssh_connection.rb
-- lib/circus/agents/logger.rb
-- lib/circus/agents/conversation.rb
-- lib/circus/cli.rb
-- lib/circus/application.rb
+- lib/circus/connection_builder.rb
+- lib/circus/booth_client.rb
 - lib/circus/profiles.rb
-- lib/circus/repos.rb
 - lib/circus/version.rb
-- lib/circus/booth_client.rb
+- lib/circus/local_config.rb
 - lib/circus/booth_tool.rb
+- lib/circus/cli.rb
+- lib/circus/resource_allocator_client.rb
+- lib/circus/external_util.rb
+- lib/circus/repos/git.rb
+- lib/circus/repos/mercurial.rb
+- lib/circus/repos.rb
+- lib/circus/profiles/rack.rb
+- lib/circus/profiles/ruby_base.rb
+- lib/circus/profiles/maven_webapp.rb
+- lib/circus/profiles/pure_py.rb
+- lib/circus/profiles/chef_stack.rb
+- lib/circus/profiles/maven_webapp_jetty.xml.erb
+- lib/circus/profiles/jekyll.rb
+- lib/circus/profiles/make_base.rb
+- lib/circus/profiles/shell.rb
+- lib/circus/profiles/pure_rb.rb
+- lib/circus/profiles/maven_webapp_jetty_app.xml.erb
+- lib/circus/profiles/python_base.rb
+- lib/circus/profiles/django.rb
+- lib/circus/profiles/base.rb
 - lib/circus.rb
-- lib/bundler/patches.rb
-- lib/bundler/circus_bundler.rb
-- lib/bundler/circus_util.rb
-- vendor/ruby-dbus/doc/tutorial/src/default.template
-- vendor/ruby-dbus/doc/tutorial/src/10.intro.page
-- vendor/ruby-dbus/doc/tutorial/src/00.index.page
-- vendor/ruby-dbus/doc/tutorial/src/30.service.page
-- vendor/ruby-dbus/doc/tutorial/src/default.css
-- vendor/ruby-dbus/doc/tutorial/src/20.basic_client.page
-- vendor/ruby-dbus/setup.rb
-- vendor/ruby-dbus/ChangeLog
-- vendor/ruby-dbus/lib/dbus.rb
-- vendor/ruby-dbus/lib/dbus/export.rb
-- vendor/ruby-dbus/lib/dbus/type.rb
-- vendor/ruby-dbus/lib/dbus/auth.rb
-- vendor/ruby-dbus/lib/dbus/message.rb
-- vendor/ruby-dbus/lib/dbus/bus.rb
-- vendor/ruby-dbus/lib/dbus/marshall.rb
-- vendor/ruby-dbus/lib/dbus/matchrule.rb
-- vendor/ruby-dbus/lib/dbus/introspect.rb
-- vendor/ruby-dbus/README
-- vendor/ruby-dbus/HOWTO-RELEASE
-- vendor/ruby-dbus/NEWS
 - vendor/ruby-dbus/Rakefile
-- vendor/ruby-dbus/examples/service/service_newapi.rb
-- vendor/ruby-dbus/examples/service/call_service.rb
+- vendor/ruby-dbus/HOWTO-RELEASE
+- vendor/ruby-dbus/ChangeLog
+- vendor/ruby-dbus/COPYING
+- vendor/ruby-dbus/examples/utils/listnames.rb
+- vendor/ruby-dbus/examples/utils/notify.rb
 - vendor/ruby-dbus/examples/simple/call_introspect.rb
 - vendor/ruby-dbus/examples/rhythmbox/playpause.rb
-- vendor/ruby-dbus/examples/no-introspect/nm-test.rb
-- vendor/ruby-dbus/examples/no-introspect/tracker-test.rb
 - vendor/ruby-dbus/examples/gdbus/gdbus
-- vendor/ruby-dbus/examples/gdbus/gdbus.glade
 - vendor/ruby-dbus/examples/gdbus/launch.sh
-- vendor/ruby-dbus/examples/utils/notify.rb
-- vendor/ruby-dbus/examples/utils/listnames.rb
-- vendor/ruby-dbus/ruby-dbus.gemspec
+- vendor/ruby-dbus/examples/gdbus/gdbus.glade
+- vendor/ruby-dbus/examples/service/service_newapi.rb
+- vendor/ruby-dbus/examples/service/call_service.rb
+- vendor/ruby-dbus/examples/no-introspect/tracker-test.rb
+- vendor/ruby-dbus/examples/no-introspect/nm-test.rb
+- vendor/ruby-dbus/lib/dbus.rb
+- vendor/ruby-dbus/lib/dbus/bus.rb
+- vendor/ruby-dbus/lib/dbus/message.rb
+- vendor/ruby-dbus/lib/dbus/introspect.rb
+- vendor/ruby-dbus/lib/dbus/matchrule.rb
+- vendor/ruby-dbus/lib/dbus/auth.rb
+- vendor/ruby-dbus/lib/dbus/marshall.rb
+- vendor/ruby-dbus/lib/dbus/export.rb
+- vendor/ruby-dbus/lib/dbus/type.rb
+- vendor/ruby-dbus/setup.rb
+- vendor/ruby-dbus/NEWS
+- vendor/ruby-dbus/README
+- vendor/ruby-dbus/test/variant_test.rb
+- vendor/ruby-dbus/test/t6-loop.rb
 - vendor/ruby-dbus/test/server_test.rb
-- vendor/ruby-dbus/test/test_server
-- vendor/ruby-dbus/test/t1
 - vendor/ruby-dbus/test/service_newapi.rb
-- vendor/ruby-dbus/test/bus_driver_test.rb
-- vendor/ruby-dbus/test/t6-loop.rb
 - vendor/ruby-dbus/test/server_robustness_test.rb
 - vendor/ruby-dbus/test/t3-ticket27.rb
 - vendor/ruby-dbus/test/test_all
-- vendor/ruby-dbus/test/t5-report-dbus-interface.rb
-- vendor/ruby-dbus/test/variant_test.rb
+- vendor/ruby-dbus/test/test_server
+- vendor/ruby-dbus/test/t1
+- vendor/ruby-dbus/test/signal_test.rb
 - vendor/ruby-dbus/test/t2.rb
+- vendor/ruby-dbus/test/bus_driver_test.rb
 - vendor/ruby-dbus/test/session_bus_test_manual.rb
-- vendor/ruby-dbus/test/signal_test.rb
 - vendor/ruby-dbus/test/Makefile
-- vendor/ruby-dbus/COPYING
+- vendor/ruby-dbus/test/t5-report-dbus-interface.rb
+- vendor/ruby-dbus/doc/tutorial/src/30.service.page
+- vendor/ruby-dbus/doc/tutorial/src/default.css
+- vendor/ruby-dbus/doc/tutorial/src/00.index.page
+- vendor/ruby-dbus/doc/tutorial/src/10.intro.page
+- vendor/ruby-dbus/doc/tutorial/src/20.basic_client.page
+- vendor/ruby-dbus/doc/tutorial/src/default.template
+- vendor/ruby-dbus/ruby-dbus.gemspec
 - LICENSE
 - README.md
 has_rdoc: true
@@ -199,16 +229,20 @@ require_paths:
 - lib
 - vendor/ruby-dbus/lib
 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 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 31
       segments: 
       - 1
       - 3
@@ -217,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Deploying the circus that is your application