sinatra-packrat 0.0.1 → 0.1.0

data/bin/packrat

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+
+require "yaml"
+
+config_path = ARGV[0]
+config = YAML::load_file(config_path)
+
+config["modules"].each do |mod|
+  next unless mod["git"]
+
+  if mod["path"]
+    repo_path = mod["path"]
+  else
+    repo_name = File.basename mod["git"], '.git'
+    repo_path = File.join 'modules/', repo_name
+  end
+
+  if File.directory? repo_path
+    Dir.chdir repo_path do
+      p "pulling from #{mod["git"]} into #{repo_path}"
+      `git pull #{mod["git"]} master`
+    end
+  else
+    p "cloning #{mod["git"]} into #{repo_path}"
+    `git clone #{mod["git"]} #{repo_path}`
+  end
+end

data/lib/sinatra/packrat.rb

@@ -42,10 +42,8 @@ module Sinatra
 
       klass = app
 
-      Kernel.class_exec do
-        define_method :packrat do |&block|
-          klass.class_exec &block
-        end
+      Kernel.send :define_method, :packrat do |&block|
+        klass.class_exec &block
       end
     end
 
@@ -91,21 +89,22 @@ module Sinatra
 
       config["modules"].each do |mod|
 
-        case mod
-        when String
-          path = mod
-        when Hash
+        if mod["path"]
           path = mod["path"]
-          override_settings = mod["settings"]
+        elsif mod["git"]
+          git_repo = File.basename mod["git"], '.git'
+          path = File.join 'modules/', git_repo
         end
-
-        full_module_path = File.join( caller_path, path )
+        
+        full_path = File.join(caller_path, path)
+        override_settings = mod["settings"]
 
         if override_settings
-          register_module( full_module_path, override_settings )
+          register_module( full_path, override_settings )
         else 
-          register_module full_module_path
+          register_module full_path
         end
+
       end
     end
     

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Brennan Roberts
@@ -21,8 +21,8 @@ dependencies: []
 
 description: Packrat is a Sinantra extension based around the idea of mixing and matching. With Packrat we can combine multiple Sinatra applications into one instance, where they can share configuration data, filters, css and other static assets. Creating a new site out of existing pieces should be as simple as cloning a series of pieces, and for each one, adding one line to a config file.
 email: brennan@oblong.com
-executables: []
-
+executables: 
+- packrat
 extensions: []
 
 extra_rdoc_files: []