wire-framework 0.1.5.8 → 0.1.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d79aa2208acd914eb50a86bd6f577a9144509e0
-  data.tar.gz: 1bd6db517477eabc4f522dbf1322198664109ac4
+  metadata.gz: 2858d57db2bf499296459695b344266fc2ec03ad
+  data.tar.gz: 0d07178f4f4af3365e42b41b963d618e7eed237e
 SHA512:
-  metadata.gz: ff82b680ab9e22972050943e833bac2be76010fd0a6446c2912e84c7e6619acefcc8738d5776f72e9ff3fcdd49dffe309667582d1c86fbfb997b76c1200cc3ac
-  data.tar.gz: 2e23a270bbdb9de4f1e5ecc1ed81b53ee826d3d3a1fc2e1b8afd722fdcee452ff15602d7f48a22b47633aa5250aa0bee6e9a18688d053ed71b7f4469e6909e92
+  metadata.gz: 7f9ddc12f09de5f0826b5c1484a00ebad077bbe01651aa068b98907675c9f05626737cba9168b00a0d59eebd3aa84a4653e13eaea516c14b818acc102f213c60
+  data.tar.gz: 23aca561ecc20cc1d9473500d0b22c97f1b6450a54ff34948c7e43325439d40127e6dfdcd134003292e876ba17789629ef9844383816360c1a1f57a018bb54e2

data/lib/app.rb

@@ -35,7 +35,7 @@ module Wire
       conf
     end
 
-    # Read all of the configs in './configs/apps'
+    # Read all of the configs in './config/apps'
     # @return [void]
     def self.read_configs
       Wire::Config.read_config_dir('config/apps', method(:configure))

data/lib/app/db.rb

@@ -21,7 +21,7 @@ require 'sequel'
 # @author Bryan T. Meyers
 module DB
 
-  # DB-specific configuration
+  # Model-specific configuration
   # @param [Hash] conf the existing configuration
   # @return [Hash] post-processed configuration
   def self.configure(conf)
@@ -31,6 +31,24 @@ module DB
     conf
   end
 
+  # DB-specific configuration
+  # @param [Hash] conf the existing configuration
+  # @return [Hash] post-processed configuration
+  def self.init_db(conf)
+    config = {}
+    conf.each do |k,v|
+      config[k.to_sym] = v
+    end
+    config['db'] = Sequel.connect(config)
+    config
+  end
+
+  # Read all of the configs in './configs/dbs'
+  # @return [void]
+  def self.read_configs
+    Wire::Config.read_config_dir('config/dbs', method(:init_db))
+  end
+
   # Add a new object to the DB table
   # @param [Hash] context the context for this request
   # @return [Response] a valid Rack response triplet, or status code

data/lib/app/history.rb

@@ -24,7 +24,7 @@ module History
   # Configure this History with a log template
   # @param [Hash] conf the raw configuration
   # @return [Hash] post-processed configuration
-  def self.configure(conf)
+  def configure(conf)
     conf['log'] = Tilt.new(conf['log'], 1, { ugly: true })
     conf
   end
@@ -33,11 +33,8 @@ module History
   # @param [Hash] context the context for this request
   # @return [Response] the history, or status code
   def do_read(actions, context)
-    list = get_log(context.config['host'],
+    list = get_log(context.closet.repos[context.config['repo']],
                    context.resource,
-                   context.config['user'],
-                   context.config['pass'],
-                   context.config['web_folder'],
                    context.id)
     if list == 404
       return 404

data/lib/app/history/svn.rb

@@ -24,19 +24,16 @@ module History
     extend History
 
     # Get the log information for any part of a Repo
-    # @param [String] host the name of the host to connect to
+    # @param [Hash] conf the repo config
     # @param [String] repo the name of the repository to access
-    # @param [String] user the username for connecting to SVN
-    # @param [String] pass the password for connecting to SVN
-    # @param [String] web the web path of the repo
     # @param [String] id the sub-URI of the item to access
     # @return [Hash] the history entries
-    def self.get_log(host, repo, user, pass, web, id = nil)
-      options = "--username #{user} --password #{pass}"
-      uri     = "svn://#{host}/#{repo}"
+    def self.get_log(conf, repo, id = nil)
+      options = "--username #{conf['user']} --password #{conf['password']}"
+      uri     = "#{conf['protocol']}://#{conf['host']}/#{repo}"
       if id
-        if web
-          uri += "/#{web}"
+        if conf['web_folder']
+          uri += "/#{conf['web_folder']}"
         end
         uri += "/#{id}"
       end

data/lib/app/login.rb

@@ -23,7 +23,7 @@ module Login
   # @param [Hash] context the context for this request
   # @return [Response] a redirect message returning to the previous page
   def self.invoke(actions, context)
-    [307, {'Location' => context.referer.join('/')}, ['Login Redirect']]
+    [307, { 'Location' => context.referer.join('/') }, ['Login Redirect']]
   end
 
 end

data/lib/app/render/document.rb

@@ -30,10 +30,10 @@ module Render
       renderer = context.closet.renderers[mime]
       if renderer
         template = renderer['partial']
-        template.render(self, {actions:  actions,
-                               context:  context,
-                               mime:     mime,
-                               response: response[2]})
+        template.render(self, { actions:  actions,
+                                context:  context,
+                                mime:     mime,
+                                response: response[2] })
       else
         response
       end

data/lib/app/render/editor.rb

@@ -42,11 +42,11 @@ module Render
         end
       end
       if template
-        template.render(self, {actions:  actions,
-                               resource: context.resource,
-                               id:       context.id,
-                               mime:     mime,
-                               response: body})
+        template.render(self, { actions:  actions,
+                                resource: context.resource,
+                                id:       context.id,
+                                mime:     mime,
+                                response: body })
       else
         body
       end

data/lib/app/render/error.rb

@@ -24,7 +24,7 @@ module Render
     # @return [Hash] post-processed configuration
     def self.configure(conf)
       conf['errors'].each do |k, v|
-        conf['errors'][k] = Tilt.new(v, 1, {ugly: true})
+        conf['errors'][k] = Tilt.new(v, 1, { ugly: true })
       end
       conf
     end
@@ -34,9 +34,9 @@ module Render
       if errors
         template = errors[result[0]]
         if template
-          result[2] = template.render(self, {actions: actions,
-                                             context: context,
-                                             result:  result})
+          result[2] = template.render(self, { actions: actions,
+                                              context: context,
+                                              result:  result })
         end
       end
       result

data/lib/app/render/instant.rb

@@ -41,16 +41,16 @@ module Render
           renderer = context.closet.renderers["#{context.resource}/#{context.id}"]
           if renderer
             template = context.closet.templates[renderer]
-            result   = template.render(self, {actions:  actions,
-                                              context:  context,
-                                              mime:     "#{context.resource}/#{context.id}",
-                                              response: body, })
+            result   = template.render(self, { actions:  actions,
+                                               context:  context,
+                                               mime:     "#{context.resource}/#{context.id}",
+                                               response: body, })
             name     = context.config['template']
             template = context.closet.templates[name]
             if template
-              message = template['file'].render(self, {actions: actions,
-                                                       context: context,
-                                                       content: result})
+              message = template['file'].render(self, { actions: actions,
+                                                        context: context,
+                                                        content: result })
             else
               message = result
             end

data/lib/app/render/page.rb

@@ -27,7 +27,7 @@ module Render
     # @return [Response] a Rack Response triplet, or status code
     def self.render_template(actions, context, template, content)
       if template['file']
-        hash = {actions: actions, context: context, content: content}
+        hash = { actions: actions, context: context, content: content }
         if template['sources']
           template['sources'].each do |k, s|
             uri      = "http://#{context.config['remote'].split('/')[0]}"
@@ -49,7 +49,7 @@ module Render
             end
             temp = []
             if go_ahead
-              temp = RL.request(:get, uri, {remote_user: context.user})
+              temp = RL.request(:get, uri, { remote_user: context.user })
             end
             if temp[0] == 200
               begin

data/lib/app/render/partial.rb

@@ -28,10 +28,10 @@ module Render
     def self.configure(conf)
       conf['resources'].each do |k, v|
         if v.is_a? Hash
-          conf['resources'][k]['multiple'] = Tilt.new(v['multiple'], 1, {ugly: true})
-          conf['resources'][k]['single']   = Tilt.new(v['single'], 1, {ugly: true})
+          conf['resources'][k]['multiple'] = Tilt.new(v['multiple'], 1, { ugly: true })
+          conf['resources'][k]['single']   = Tilt.new(v['single'], 1, { ugly: true })
         elsif v.is_a? String
-          conf['resources'][k] = {'all' => Tilt.new(v, 1, {ugly: true})}
+          conf['resources'][k] = { 'all' => Tilt.new(v, 1, { ugly: true }) }
         end
       end
       conf
@@ -57,15 +57,15 @@ module Render
         template = resource['multiple']
       end
       if template
-        hash = {actions:  actions,
-                resource: resource,
-                mime:     mime,
-                response: body}
+        hash = { actions:  actions,
+                 resource: resource,
+                 mime:     mime,
+                 response: body }
         if resource['extras']
           resource['extras'].each do |k, v|
             temp = RL.request(:get,
                               "http://#{context.config['remote'].split('/')[0]}/#{v}",
-                              {remote_user: context.user}
+                              { remote_user: context.user }
             )[2]
             begin
               hash[k.to_sym] = JSON.parse_clean(temp)
@@ -78,7 +78,7 @@ module Render
         mime = 'text/html'
         body = template.render(self, hash)
       end
-      [200, {'Content-Type' => mime}, body]
+      [200, { 'Content-Type' => mime }, body]
     end
 
     # Read a Partial and render it to HTML
@@ -102,12 +102,12 @@ module Render
         template = resource['single']
       end
       if template
-        hash = {actions:  actions,
-                app:      context.app,
-                resource: context.resource,
-                id:       context.id,
-                mime:     mime,
-                response: body}
+        hash = { actions:  actions,
+                 app:      context.app,
+                 resource: context.resource,
+                 id:       context.id,
+                 mime:     mime,
+                 response: body }
         if resource['extras']
           resource['extras'].each do |k, v|
             temp = RL.request(:get, "http://#{context.config['remote'].split('/')[0]}/#{v}")[2]
@@ -121,7 +121,7 @@ module Render
         mime = 'text/html'
         body = template.render(self, hash)
       end
-      [200, {'Content-Type' => mime}, body]
+      [200, { 'Content-Type' => mime }, body]
     end
 
     # Proxy method used when routing

data/lib/app/render/style.rb

@@ -26,7 +26,7 @@ module Render
     # @return [Hash] post-processed configuration
     def self.configure(conf)
       conf['styles'].each do |k, v|
-        conf['styles'][k] = Tilt.new(v, 1, {ugly: true}).render
+        conf['styles'][k] = Tilt.new(v, 1, { ugly: true }).render
       end
       conf
     end
@@ -36,7 +36,7 @@ module Render
     # @return [Response] a Rack Response triplet, or status code
     def self.do_read_all(context)
       template = context.config['styles'][context.resource]
-      headers  = {'Cache-Control' => 'public,max-age=3600'}
+      headers  = { 'Cache-Control' => 'public,max-age=3600' }
       if template
         headers['Content-Type'] = 'text/css'
         [200, headers, [template]]

data/lib/app/repo.rb

@@ -25,25 +25,36 @@ module Repo
   # Configure repo with listing template
   # @param [Hash] conf the raw configuration
   # @return [Hash] post-processed configuration
-  def self.configure(conf)
+  def configure(conf)
     conf['listing'] = Tilt.new(conf['listing'], 1, { ugly: true })
     conf
   end
 
-  # Create a new Repo
+  # Read all of the configs in './configs/repos'
+  # @return [void]
+  def self.read_configs
+    Wire::Config.read_config_dir('config/repos', nil)
+  end
+
+  # Create a new file
   # @param [Hash] context the context for this request
   # @return [Response] status code
   def do_create(context)
-    path     = context.config['repos']
-    resource = context.resource
-    if path
-      if Dir.exist?("#{path}/#{resource}")
-        401
+    conf    = context.closet.repos[context.config['repo']]
+    repo    = context.resource
+    content = context.json
+    id      = context.id
+    if content[:file]
+      file = content[:file][:content].match(/base64,(.*)/)[1]
+      file = Base64.decode64(file)
+      if context.query[:type]
+        mime = context.query[:type]
       else
-        do_create_file(path, resource)
+        mime = content[:file][:mime]
       end
+      do_create_file(conf, repo, id, file, content[:message], mime, context.user)
     else
-      400
+      do_create_file(conf, repo, id, URI.unescape(content[:updated]), content[:message], context.query[:type], context.user)
     end
   end
 
@@ -51,12 +62,9 @@ module Repo
   # @param [Hash] context the context for this request
   # @return [Response] the listing, or status code
   def do_read_all(context)
+    conf = context.closet.repos[context.config['repo']]
     mime = 'text/html'
-    list = do_read_listing(context.config['web'],
-                           context.config['user'],
-                           context.config['pass'],
-                           context.config['repos'],
-                           context.resource)
+    list = do_read_listing(conf, context.resource)
     if list == 404
       return 404
     end
@@ -76,22 +84,19 @@ module Repo
   # @param [Hash] context the context for this request
   # @return [Response] the file, listing, or status code
   def do_read(context)
-    user     = context.config['user']
-    pass     = context.config['pass']
-    repo     = context.resource
+    conf     = context.closet.repos[context.config['repo']]
     referrer = context.referer
-    path     = context.config['repos']
-    web      = context.config['web']
-    rev      = context.query[:rev]
+    repo     = context.resource
     id       = context.id
-    info     = do_read_info(rev, web, user, pass, path, repo, id)
+    rev      = context.query[:rev]
+    info     = do_read_info(conf, repo, id, rev)
     if info == 404
       return 404
     end
     type = info[:@kind]
     if type.eql? 'dir'
       mime     = 'text/html'
-      list     = do_read_listing(web, user, pass, path, repo, id)
+      list     = do_read_listing(conf, repo, id)
       template = context.config['listing']
       body     = template.render(self,
                                  list:     list,
@@ -99,11 +104,11 @@ module Repo
                                  id:       id,
                                  referrer: referrer)
     else
-      body = do_read_file(rev, web, user, pass, path, repo, id)
+      body = do_read_file(conf, repo, id, rev)
       if body == 500
         return body
       end
-      mime = do_read_mime(rev, web, user, pass, path, repo, id)
+      mime = do_read_mime(conf, repo, id, rev)
     end
     headers = { 'Content-Type'  => mime,
                 'Cache-Control' => 'public',
@@ -115,11 +120,8 @@ module Repo
   # @param [Hash] context the context for this request
   # @return [Response] status code
   def do_update(context)
-    user     = context.config['user']
-    pass     = context.config['pass']
+    conf    = context.closet.repos[context.config['repo']]
     repo    = context.resource
-    path   = context.config['repos']
-    web     = context.config['web']
     content = context.json
     id      = context.id
     if content[:file]
@@ -130,9 +132,9 @@ module Repo
       else
         mime = content[:file][:mime]
       end
-      do_update_file(web, user, pass, path, repo, id, file, content[:message], mime, context.user)
+      do_update_file(conf, repo, id, file, content[:message], mime, context.user)
     else
-      do_update_file(web, user, pass, path, repo, id, URI.unescape(content[:updated]), content[:message], context.query[:type], context.user)
+      do_update_file(conf, repo, id, URI.unescape(content[:updated]), content[:message], context.query[:type], context.user)
     end
   end
 

data/lib/app/repo/svn.rb

@@ -27,37 +27,21 @@ module Repo
     # Force Nori to convert tag names to Symbols
     @@nori = Nori.new :convert_tags_to => lambda { |tag| tag.snakecase.to_sym }
 
-    # Make a new SVN repo
-    # @param [String] path the path to the repositories
-    # @param [String] repo the new repo name
-    # @return [Integer] status code
-    def self.do_create_file(path, repo)
-      `svnadmin create #{path}/#{repo}`
-      if $?.exitstatus != 0
-        500
-      else
-        200
-      end
-    end
-
     # Read a single file
-    # @param [String] rev the revision number to access
-    # @param [String] web the subdirectory for web content
-    # @param [String] user the username for connecting to SVN
-    # @param [String] pass the password for connecting to SVN
-    # @param [String] path the path to the repositories
+    # @param [String] conf the repo config
     # @param [String] repo the new repo name
     # @param [String] id the relative path to the file
+    # @param [String] rev the revision number to access
     # @return [String] the file
-    def self.do_read_file(rev, web, user, pass, path, repo, id)
-      options = "--username #{user} --password #{pass}"
+    def self.do_read_file(conf, repo, id, rev)
+      options = "--username #{conf['user']} --password #{conf['password']}"
       if rev.nil?
         rev = 'HEAD'
       end
-      if web.nil?
-        body = `svn cat #{options} -r #{rev} 'svn://localhost/#{repo}/#{id}'`
+      if conf['web_folder'].nil?
+        body = `svn cat #{options} -r #{rev} '#{conf['protocol']}://#{conf['host']}/#{repo}/#{id}'`
       else
-        body = `svn cat #{options} -r #{rev} 'svn://localhost/#{repo}/#{web}/#{id}'`
+        body = `svn cat #{options} -r #{rev} '#{conf['protocol']}://#{conf['host']}/#{repo}/#{conf['web_folder']}/#{id}'`
       end
 
       if $?.success?
@@ -68,26 +52,23 @@ module Repo
     end
 
     # Read a directory listing
-    # @param [String] web the subdirectory for web content
-    # @param [String] user the username for connecting to SVN
-    # @param [String] pass the password for connecting to SVN
-    # @param [String] path the path to the repositories
-    # @param [String] repo the new repo name
+    # @param [String] conf the repo config
+    # @param [String] repo the repo name
     # @param [String] id the relative path to the file
     # @return [Array] the directory listing
-    def self.do_read_listing(web, user, pass, path, repo, id = nil)
-      options = "--username #{user} --password #{pass}"
-      if web.nil?
+    def self.do_read_listing(conf, repo, id = nil)
+      options = "--username #{conf['user']} --password #{conf['password']}"
+      if conf['web_folder'].nil?
         if id.nil?
-          list = `svn list #{options} --xml 'svn://localhost/#{repo}'`
+          list = `svn list #{options} --xml '#{conf['protocol']}://#{conf['host']}/#{repo}'`
         else
-          list = `svn list #{options} --xml 'svn://localhost/#{repo}/#{id}'`
+          list = `svn list #{options} --xml '#{conf['protocol']}://#{conf['host']}/#{repo}/#{id}'`
         end
       else
         if id.nil?
-          list = `svn list #{options} --xml 'svn://localhost/#{repo}/#{web}'`
+          list = `svn list #{options} --xml '#{conf['protocol']}://#{conf['host']}/#{repo}/#{conf['web_folder']}'`
         else
-          list = `svn list #{options} --xml 'svn://localhost/#{repo}/#{web}/#{id}'`
+          list = `svn list #{options} --xml '#{conf['protocol']}://#{conf['host']}/#{repo}/#{conf['web_folder']}/#{id}'`
         end
       end
       unless $?.exitstatus == 0
@@ -98,23 +79,20 @@ module Repo
     end
 
     # Read Metadata for a single file
-    # @param [String] rev the revision number to access
-    # @param [String] web the subdirectory for web content
-    # @param [String] user the username for connecting to SVN
-    # @param [String] pass the password for connecting to SVN
-    # @param [String] path the path to the repositories
+    # @param [String] conf the repo config
     # @param [String] repo the new repo name
     # @param [String] id the relative path to the file
+    # @param [String] rev the revision number to access
     # @return [Hash] the metadata
-    def self.do_read_info(rev, web, user, pass, path, repo, id)
-      options = "--username #{user} --password #{pass}"
+    def self.do_read_info(conf, repo, id, rev)
+      options = "--username #{conf['user']} --password #{conf['password']}"
       if rev.nil?
         rev = 'HEAD'
       end
-      if web.nil?
-        info = `svn info #{options} -r #{rev} --xml 'svn://localhost/#{repo}/#{id}'`
+      if conf['web_folder'].nil?
+        info = `svn info #{options} -r #{rev} --xml '#{conf['protocol']}://#{conf['host']}/#{repo}/#{id}'`
       else
-        info = `svn info #{options} -r #{rev} --xml 'svn://localhost/#{repo}/#{web}/#{id}'`
+        info = `svn info #{options} -r #{rev} --xml '#{conf['protocol']}://#{conf['host']}/#{repo}/#{conf['web_folder']}/#{id}'`
       end
 
       unless $?.exitstatus == 0
@@ -125,23 +103,20 @@ module Repo
     end
 
     # Get a file's MIME type
-    # @param [String] rev the revision number to access
-    # @param [String] web the subdirectory for web content
-    # @param [String] user the username for connecting to SVN
-    # @param [String] pass the password for connecting to SVN
-    # @param [String] path the path to the repositories
+    # @param [String] conf the repo config
     # @param [String] repo the new repo name
     # @param [String] id the relative path to the file
+    # @param [String] rev the revision number to access
     # @return [String] the MIME type
-    def self.do_read_mime(rev, web, user, pass, path, repo, id)
-      options = "--username #{user} --password #{pass}"
+    def self.do_read_mime(conf, repo, id, rev)
+      options = "--username #{conf['user']} --password #{conf['password']}"
       if rev.nil?
         rev = 'HEAD'
       end
-      if web.nil?
-        mime = `svn propget #{options} -r #{rev} --xml svn:mime-type 'svn://localhost/#{repo}/#{id}'`
+      if conf['web_folder'].nil?
+        mime = `svn propget #{options} -r #{rev} --xml svn:mime-type '#{conf['protocol']}://#{conf['host']}/#{repo}/#{id}'`
       else
-        mime = `svn propget #{options} -r #{rev} --xml svn:mime-type 'svn://localhost/#{repo}/#{web}/#{id}'`
+        mime = `svn propget #{options} -r #{rev} --xml svn:mime-type '#{conf['protocol']}://#{conf['host']}/#{repo}/#{conf['web_folder']}/#{id}'`
       end
       unless $?.success?
         return 500
@@ -154,11 +129,8 @@ module Repo
       end
     end
 
-    # Update a single file
-    # @param [String] web the subdirectory for web content
-    # @param [String] user the username for connecting to SVN
-    # @param [String] pass the password for connecting to SVN
-    # @param [String] path the path to the repositories
+    # Update or create a single file
+    # @param [String] conf the repo config
     # @param [String] repo the new repo name
     # @param [String] id the relative path to the file
     # @param [String] content the updated file
@@ -166,50 +138,56 @@ module Repo
     # @param [String] mime the mime-type to set
     # @param [String] username the Author of this change
     # @return [Integer] status code
-    def self.do_update_file(web, user, pass, path, repo, id, content, message, mime, username)
-      options = "--username #{user} --password #{pass}"
+    def self.do_update_file(conf, repo, id, content, message, mime, username)
+      options = "--depth empty --username #{conf['user']} --password #{conf['password']}"
       status  = 500
-      id      = id.split('/')
-      id.pop
-      id = id.join('/')
-      if web.nil?
-        repo_path = "/tmp/svn/#{repo}/#{id}"
-      else
-        repo_path = "/tmp/svn/#{repo}/#{web}/#{id}"
-      end
+      repo_path = "/tmp/#{username}/#{repo}"
       unless Dir.exist? repo_path
         FileUtils.mkdir_p(repo_path)
       end
 
-      `svn checkout #{options} 'svn://localhost/#{repo}' '/tmp/svn/#{repo}'`
-      id = CGI.unescape(id)
+      `svn checkout #{options} '#{conf['protocol']}://#{conf['host']}/#{repo}' '#{repo_path}'`
+
       if $?.exitstatus == 0
-        id = id.split('/')
-        id.pop
-        id = id.join('/')
-        if web.nil?
-          file_path = "/tmp/svn/#{repo}/#{id}"
-        else
-          file_path = "/tmp/svn/#{repo}/#{web}/#{id}"
+        file_path = CGI.unescape(id)
+        if conf['web_folder']
+          file_path = "#{conf['web_folder']}/#{file_path}"
         end
+        folder_path = file_path.split('/')
+        folder_path.pop
+        folder_path = folder_path.join('/')
 
-        unless Dir.exist? file_path
-          FileUtils.mkdir_p(file_path)
+        unless Dir.exist? folder_path
+          FileUtils.mkdir_p(folder_path)
         end
 
         file = File.open(file_path, 'w+')
         file.syswrite(content)
         file.close
-        `svn add --force "/tmp/svn/#{repo}/*"`
+        `svn add --force "#{repo_path}/*"`
         `svn propset svn:mime-type "#{mime}" "#{file_path}"`
-        `svn commit #{options} -m "#{message}" "/tmp/svn/#{repo}"`
+        `svn commit #{options} -m "#{message}" "#{repo_path}"`
         if $?.exitstatus == 0
           status = 200
         end
-        `svn propset #{options} --revprop -r HEAD svn:author '#{username}' "/tmp/svn/#{repo}"`
+        `svn propset #{options} --revprop -r HEAD svn:author '#{username}' "#{repo_path}"`
       end
-      `rm -R '/tmp/svn/#{repo}'`
+      `rm -R '#{repo_path}'`
       status
     end
+
+    # Create a single file
+    # @param [String] conf the repo config
+    # @param [String] repo the new repo name
+    # @param [String] id the relative path to the file
+    # @param [String] content the updated file
+    # @param [String] message the commit message
+    # @param [String] mime the mime-type to set
+    # @param [String] username the Author of this change
+    # @return [Integer] status code
+    def self.do_create_file(conf, repo, id, content, message, mime, username)
+      do_update_file(conf, repo, id, content, message, mime, username)
+    end
+
   end
 end

data/lib/closet.rb

@@ -28,15 +28,41 @@ module Wire
   class Closet
     include Wire::Auth
 
-    attr_accessor :apps, :editors, :renderers, :templates
+    attr_reader :apps, :editors, :renderers, :templates
+    attr_reader :dbs, :env, :repos, :mode
 
-    # Create an empty Closet
+    # Create an empty Closet and connect to datasources.
     # @return [Wire::Closet] the new closet
     def initialize
-      @apps      = {}
-      @editors   = {}
-      @renderers = {}
-      @templates = {}
+      @mode = ENV['RACK_ENV']
+      if @mode.eql? 'development'
+        $stderr.puts 'Starting Up Wire...'
+        $stderr.puts 'Reading Environment Config...'
+      end
+      @env = Wire::Config.read_config_dir('./config/env', nil)[@mode]
+      if @mode.eql? 'development'
+        $stderr.puts 'Reading DB Configs...'
+      end
+      @dbs = Wire::DB.read_configs
+      if @mode.eql? 'development'
+        $stderr.puts 'Reading Repo Configs...'
+      end
+      @repos = Wire::Repo.read_configs
+    end
+
+    # Setup the closet
+    def build
+      if @mode.eql? 'development'
+        $stderr.puts 'Reading App Configs...'
+      end
+      @apps = Wire::App.read_configs
+      if @mode.eql? 'development'
+        $stderr.puts 'Reading [Editor|Renderer|Template] Configs...'
+      end
+      @editors, @renderers, @templates = Wire::Renderer.read_configs
+      if @mode.eql? 'development'
+        info
+      end
     end
 
     # Route a Request to the correct Wire::App
@@ -77,23 +103,6 @@ module Wire
       response
     end
 
-    # A factory method for configuring a Closet
-    # @param [Proc] block the configuration routine
-    # @return [Wire::Closet] the configured Closet
-    def self.build
-      closet = Wire::Closet.new
-      if ENV['RACK_ENV'].eql? 'development'
-        $stderr.puts 'Starting Up Wire...'
-        $stderr.puts 'Starting Apps...'
-      end
-      closet.apps                                        = Wire::App.read_configs
-      closet.editors, closet.renderers, closet.templates = Wire::Renderer.read_configs
-      if ENV['RACK_ENV'].eql? 'development'
-        closet.info
-      end
-      closet
-    end
-
     # Print out a human-readable configuration
     # @return [void]
     def info

data/lib/closet/context.rb

@@ -136,8 +136,8 @@ module Wire
     # @param [Symbol] method the action to use when forwarding
     # @return [Response] a Rack Response triplet, or status code
     def forward(method)
-      headers = {referer:     @referer.join('/'),
-                 remote_user: @user}
+      headers = { referer:     @referer.join('/'),
+                  remote_user: @user }
       verb    = CONVERT[method]
       uri     = "http://#{@config['remote']}/#{@resource}"
       if [:update, :read, :delete].include?(method)

data/lib/closet/renderer.rb

@@ -26,7 +26,7 @@ module Wire
     # @param [Hash] conf the raw configuration
     # @return [Hash] post-processed configuration
     def self.configure_partial(conf)
-      conf['partial'] = Tilt.new(conf['partial'], 1, {ugly: true})
+      conf['partial'] = Tilt.new(conf['partial'], 1, { ugly: true })
       conf
     end
 
@@ -34,11 +34,11 @@ module Wire
     # @param [Hash] conf the raw configuration
     # @return [Hash] post-processed configuration
     def self.configure_template(conf)
-      conf['file'] = Tilt.new(conf['file'], 1, {ugly: true})
+      conf['file'] = Tilt.new(conf['file'], 1, { ugly: true })
       conf
     end
 
-    # Read all of the configs in './configs/apps'
+    # Read all of the configs in './config/editors', './config/renderers', '.config/templates'
     # @return [void]
     def self.read_configs
       editors   = Wire::Config.read_config_dir('config/editors', method(:configure_template))

data/lib/wire.rb

@@ -33,7 +33,7 @@ end
 # @author Bryan T. Meyers
 module Wire
   # Current version of the Wire Gem
-  VERSION = '0.1.5.8'
+  VERSION = '0.1.5.9'
 end
 
 require_relative 'app'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wire-framework
 version: !ruby/object:Gem::Version
-  version: 0.1.5.8
+  version: 0.1.5.9
 platform: ruby
 authors:
 - Bryan T. Meyers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print