wire-framework 0.1.4.26 → 0.1.5

data/lib/app/repo/svn.rb

@@ -1,185 +1,211 @@
-require_relative '../repo'
+##
+# Copyright 2017 Bryan T. Meyers
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+#	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#	See the License for the specific language governing permissions and
+#	limitations under the License.
+##
+
 require 'nori'
 require 'fileutils'
+require_relative '../repo'
 
 # Force Nori to convert tag names to Symbols
 $nori = Nori.new :convert_tags_to => lambda { |tag| tag.snakecase.to_sym }
 
 module Repo
-	# Repo::SVN is a connector for svnserve
-	# @author Bryan T. Meyers
-	module SVN
-		extend Wire::App
-		extend Wire::Resource
-		extend Repo
-
-		# 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)
-			result = 200
-			`svnadmin create #{path}/#{repo}`
-			if $?.exitstatus != 0
-				return 500
-			end
-
-			if $?.exitstatus != 0
-				500
-			else
-				result
-			end
-		end
-
-		# Read a single file
-		# @param [String] rev the revision number to access
-		# @param [String] web the subdirectory for web content
-		# @param [String] path the path to the repositories
-		# @param [String] repo the new repo name
-		# @param [String] id the relative path to the file
-		# @return [String] the file
-		def self.do_read_file(rev, web, path, repo, id)
-			options = "--username #{$environment[:repos_user]} --password #{$environment[:repos_password]}"
-			if rev.nil?
-				rev = 'HEAD'
-			end
-			if web.nil?
-				body = `svn cat #{options} -r #{rev} 'svn://localhost/#{repo}/#{id}'`
-			else
-				body = `svn cat #{options} -r #{rev} 'svn://localhost/#{repo}/#{web}/#{id}'`
-			end
-
-			if $?.success?
-				body
-			else
-				500
-			end
-		end
-
-		# Read a directory listing
-		# @param [String] web the subdirectory for web content
-		# @param [String] path the path to the repositories
-		# @param [String] repo the new repo name
-		# @param [String] id the relative path to the file
-		# @return [Array] the directory listing
-		def self.do_read_listing(web, path, repo, id = nil)
-			options = "--username #{$environment[:repos_user]} --password #{$environment[:repos_password]}"
-			if web.nil?
-				if id.nil?
-					list = `svn list #{options} --xml 'svn://localhost/#{repo}'`
-				else
-					list = `svn list #{options} --xml 'svn://localhost/#{repo}/#{id}'`
-				end
-			else
-				if id.nil?
-					list = `svn list #{options} --xml 'svn://localhost/#{repo}/#{web}'`
-				else
-					list = `svn list #{options} --xml 'svn://localhost/#{repo}/#{web}/#{id}'`
-				end
-			end
-			unless $?.exitstatus == 0
-				return 404
-			end
-			list = $nori.parse(list)
-			list[:lists][:list][:entry]
-		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] path the path to the repositories
-		# @param [String] repo the new repo name
-		# @param [String] id the relative path to the file
-		# @return [Hash] the metadata
-		def self.do_read_info(rev, web, path, repo, id)
-			options = "--username #{$environment[:repos_user]} --password #{$environment[:repos_password]}"
-			if rev.nil?
-				rev = 'HEAD'
-			end
-			if web.nil?
-				info = `svn info #{options} -r #{rev} --xml 'svn://localhost/#{repo}/#{id}'`
-			else
-				info = `svn info #{options} -r #{rev} --xml 'svn://localhost/#{repo}/#{web}/#{id}'`
-			end
-
-			unless $?.exitstatus == 0
-				return 404
-			end
-			info = $nori.parse(info)
-			info[:info][:entry]
-		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] path the path to the repositories
-		# @param [String] repo the new repo name
-		# @param [String] id the relative path to the file
-		# @return [String] the MIME type
-		def self.do_read_mime(rev, web, path, repo, id)
-			options = "--username #{$environment[:repos_user]} --password #{$environment[:repos_password]}"
-			if rev.nil?
-				rev = 'HEAD'
-			end
-			if web.nil?
-				mime = `svn propget #{options} -r #{rev} --xml svn:mime-type 'svn://localhost/#{repo}/#{id}'`
-			else
-				mime = `svn propget #{options} -r #{rev} --xml svn:mime-type 'svn://localhost/#{repo}/#{web}/#{id}'`
-			end
-
-			unless $?.success?
-				return 500
-			end
-			mime = $nori.parse(mime)
-			if mime[:properties].nil?
-				'application/octet-stream'
-			else
-				mime[:properties][:target][:property]
-			end
-		end
-
-		# Update a single file
-		# @param [String] web the subdirectory for web content
-		# @param [String] path the path to the repositories
-		# @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] user the Author of this change
-		# @return [Integer] status code
-		def self.do_update_file(web, path, repo, id, content, message, mime, user)
-			options = "--username #{$environment[:repos_user]} --password #{$environment[:repos_password]}"
-			status   = 500
-			`svn checkout #{options} svn://localhost/#{repo} /tmp/svn/#{repo}`
-			if $?.exitstatus == 0
-
-				if web.nil?
-					file_path = "/tmp/svn/#{repo}/#{id}"
-				else
-					file_path = "/tmp/svn/#{repo}/#{web}/#{id}"
-					id = id.split('/')
-					id.pop
-					id = id.join('/')
-					dir_path = "/tmp/svn/#{repo}/#{web}/#{id}"
-					unless Dir.exist? dir_path
-						FileUtils.mkdir_p( dir_path )
-					end
-				end
-
-				file = File.open(file_path, 'w+')
-				file.syswrite(content)
-				file.close
-				`svn add --force /tmp/svn/#{repo}/*`
-				`svn propset svn:mime-type "#{mime}" #{file_path}`
-				`svn commit #{options} -m "#{message}" /tmp/svn/#{repo}`
-				if $?.exitstatus == 0
-					status = 200
-				end
-				`svn propset #{options} --revprop -r HEAD svn:author '#{user}' /tmp/svn/#{repo}`
-			end
-			`rm -R /tmp/svn/#{repo}`
-			status
-		end
-	end
+  # Repo::SVN is a connector for svnserve
+  # @author Bryan T. Meyers
+  module SVN
+    extend Repo
+
+    # 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)
+      result = 200
+      `svnadmin create #{path}/#{repo}`
+      if $?.exitstatus != 0
+        return 500
+      end
+
+      if $?.exitstatus != 0
+        500
+      else
+        result
+      end
+    end
+
+    # Read a single file
+    # @param [String] rev the revision number to access
+    # @param [String] web the subdirectory for web content
+    # @param [String] path the path to the repositories
+    # @param [String] repo the new repo name
+    # @param [String] id the relative path to the file
+    # @return [String] the file
+    def self.do_read_file(rev, web, path, repo, id)
+      options = "--username #{$environment[:repos_user]} --password #{$environment[:repos_password]}"
+      if rev.nil?
+        rev = 'HEAD'
+      end
+      if web.nil?
+        body = `svn cat #{options} -r #{rev} 'svn://localhost/#{repo}/#{id}'`
+      else
+        body = `svn cat #{options} -r #{rev} 'svn://localhost/#{repo}/#{web}/#{id}'`
+      end
+
+      if $?.success?
+        body
+      else
+        500
+      end
+    end
+
+    # Read a directory listing
+    # @param [String] web the subdirectory for web content
+    # @param [String] path the path to the repositories
+    # @param [String] repo the new repo name
+    # @param [String] id the relative path to the file
+    # @return [Array] the directory listing
+    def self.do_read_listing(web, path, repo, id = nil)
+      options = "--username #{$environment[:repos_user]} --password #{$environment[:repos_password]}"
+      if web.nil?
+        if id.nil?
+          list = `svn list #{options} --xml 'svn://localhost/#{repo}'`
+        else
+          list = `svn list #{options} --xml 'svn://localhost/#{repo}/#{id}'`
+        end
+      else
+        if id.nil?
+          list = `svn list #{options} --xml 'svn://localhost/#{repo}/#{web}'`
+        else
+          list = `svn list #{options} --xml 'svn://localhost/#{repo}/#{web}/#{id}'`
+        end
+      end
+      unless $?.exitstatus == 0
+        return 404
+      end
+      list = $nori.parse(list)
+      list[:lists][:list][:entry]
+    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] path the path to the repositories
+    # @param [String] repo the new repo name
+    # @param [String] id the relative path to the file
+    # @return [Hash] the metadata
+    def self.do_read_info(rev, web, path, repo, id)
+      options = "--username #{$environment[:repos_user]} --password #{$environment[:repos_password]}"
+      if rev.nil?
+        rev = 'HEAD'
+      end
+      if web.nil?
+        info = `svn info #{options} -r #{rev} --xml 'svn://localhost/#{repo}/#{id}'`
+      else
+        info = `svn info #{options} -r #{rev} --xml 'svn://localhost/#{repo}/#{web}/#{id}'`
+      end
+
+      unless $?.exitstatus == 0
+        return 404
+      end
+      info = $nori.parse(info)
+      info[:info][:entry]
+    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] path the path to the repositories
+    # @param [String] repo the new repo name
+    # @param [String] id the relative path to the file
+    # @return [String] the MIME type
+    def self.do_read_mime(rev, web, path, repo, id)
+      options = "--username #{$environment[:repos_user]} --password #{$environment[:repos_password]}"
+      if rev.nil?
+        rev = 'HEAD'
+      end
+      if web.nil?
+        mime = `svn propget #{options} -r #{rev} --xml svn:mime-type 'svn://localhost/#{repo}/#{id}'`
+      else
+        mime = `svn propget #{options} -r #{rev} --xml svn:mime-type 'svn://localhost/#{repo}/#{web}/#{id}'`
+      end
+
+      unless $?.success?
+        return 500
+      end
+      mime = $nori.parse(mime)
+      if mime[:properties].nil?
+        'application/octet-stream'
+      else
+        mime[:properties][:target][:property]
+      end
+    end
+
+    # Update a single file
+    # @param [String] web the subdirectory for web content
+    # @param [String] path the path to the repositories
+    # @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] user the Author of this change
+    # @return [Integer] status code
+    def self.do_update_file(web, path, repo, id, content, message, mime, user)
+      options = "--username #{$environment[:repos_user]} --password #{$environment[:repos_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
+      unless Dir.exist? repo_path
+        FileUtils.mkdir_p(repo_path)
+      end
+
+      `svn checkout #{options} 'svn://localhost/#{repo}' '/tmp/svn/#{repo}'`
+      id = CGI.unescape(id)
+      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}"
+        end
+
+        unless Dir.exist? file_path
+          FileUtils.mkdir_p(file_path)
+        end
+
+        file = File.open(file_path, 'w+')
+        file.syswrite(content)
+        file.close
+        `svn add --force "/tmp/svn/#{repo}/*"`
+        `svn propset svn:mime-type "#{mime}" "#{file_path}"`
+        `svn commit #{options} -m "#{message}" "/tmp/svn/#{repo}"`
+        if $?.exitstatus == 0
+          status = 200
+        end
+        `svn propset #{options} --revprop -r HEAD svn:author '#{user}' "/tmp/svn/#{repo}"`
+      end
+      `rm -R '/tmp/svn/#{repo}'`
+      status
+    end
+  end
 end

data/lib/closet.rb

@@ -1,106 +1,118 @@
+##
+# Copyright 2017 Bryan T. Meyers
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+#	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#	See the License for the specific language governing permissions and
+#	limitations under the License.
+##
+
 require 'rack'
-require 'awesome_print'
 require_relative 'app'
 require_relative 'closet/auth'
+require_relative 'closet/config'
 require_relative 'closet/context'
-require_relative 'closet/resource'
 require_relative 'closet/renderer'
 
 
 module Wire
-	# A Closet is a configured Wire Environment
-	# @author Bryan T. Meyers
-	class Closet
-		include Wire::App
-		include Wire::Auth
-		include Wire::Renderer
-		include Wire::Resource
+  # A Closet is a configured Wire Environment
+  # @author Bryan T. Meyers
+  class Closet
+    include Wire::Auth
 
-		# Create an empty Closet
-		# @return [Wire::Closet] the new closet
-		def initialize
-			$apps      = {}
-			$editors   = {}
-			$renderers = {}
-			$templates = {}
-		end
+    # Create an empty Closet
+    # @return [Wire::Closet] the new closet
+    def initialize
+      $wire_apps      = {}
+      $wire_editors   = {}
+      $wire_renderers = {}
+      $wire_templates = {}
+    end
 
-		# Route a Request to the correct Wire::App
-		# @param [Wire::Context] context the context of this Request
-		# @return [Response] a Rack Response triplet, or status code
-		def route(context)
-			actions = actions_allowed(context)
-			if actions.include? context.action
-				context.type.invoke(actions, context)
-			else
-				401
-			end
-		end
+    # Route a Request to the correct Wire::App
+    # @param [Wire::Context] context the context of this Request
+    # @return [Response] a Rack Response triplet, or status code
+    def route(context)
+      actions = actions_allowed(context)
+      if actions.include? context.action
+        context.config['type'].invoke(actions, context)
+      else
+        401
+      end
+    end
 
-		# Fulfill the current request
-		# @param [Hash] env the Rack environment
-		# @return [Response] a Rack Response triplet, or status code
-		def call(env)
-			begin
-				context  = Wire::Context.new(env)
-				response = route(context)
-			rescue Exception => e
-				$stderr.puts e.message
-				$stderr.puts e.backtrace
-				response = [500, {}, e.message]
-			end
-			if response.is_a? Array
-				if response[2]
-					unless response[2].is_a? Array
-						response[2] = [response[2]]
-					end
-				end
-			else
-				if response.is_a? Integer
-					response = [response, {}, []]
-				else
-					response = [200, {}, [response]]
-				end
-			end
-			response
-		end
+    # Fulfill the current request
+    # @param [Hash] env the Rack environment
+    # @return [Response] a Rack Response triplet, or status code
+    def call(env)
+      begin
+        context  = Wire::Context.new(env)
+        response = route(context)
+      rescue Exception => e
+        $stderr.puts e.message
+        $stderr.puts e.backtrace
+        response = [500, {}, e.message]
+      end
+      if response.is_a? Array
+        if response[2]
+          unless response[2].is_a? Array
+            response[2] = [response[2]]
+          end
+        end
+      else
+        if response.is_a? Integer
+          response = [response, {}, []]
+        else
+          response = [200, {}, [response]]
+        end
+      end
+      response
+    end
 
-		# A factory method for configuring a Closet
-		# @param [Proc] block the configuration routine
-		# @return [Wire::Closet] the configured Closet
-		def self.build(&block)
-			closet = Wire::Closet.new
-			if ENV['RACK_ENV'].eql? 'development'
-				$stderr.puts 'Starting Up Wire...'
-				$stderr.puts 'Starting Apps...'
-			end
-			Docile.dsl_eval(closet, &block)
-			if ENV['RACK_ENV'].eql? 'development'
-				closet.info
-			end
-			closet
-		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
+      Wire::App.read_configs
+      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
-			$stderr.puts "Apps:\n"
-			$apps.each do |app, config|
-				$stderr.puts "\u{2502}"
-				$stderr.puts "\u{251c} Name: #{app}"
-				if config[:auth]
-					$stderr.puts "\u{2502}\t\u{251c} Auth:"
-					if config[:auth][:level] == :app
-						$stderr.puts "\u{2502}\t\u{2502}\t\u{251c} Level:\t#{config[:auth][:level]}"
-						$stderr.puts "\u{2502}\t\u{2502}\t\u{2514} Handler:\t#{config[:auth][:handler]}"
-					else
-						$stderr.puts "\u{2502}\t\u{2502}\t\u{2514} Level:\t#{config[:auth][:level]}"
-					end
-				end
-				if config[:type]
-					$stderr.puts "\u{2502}\t\u{2514} Type: #{config[:type]}"
-				end
-			end
-		end
-	end
+    # Print out a human-readable configuration
+    # @return [void]
+    def info
+      $stderr.puts "Apps:\n"
+      $wire_apps.each do |app, config|
+        $stderr.puts "\u{2502}"
+        $stderr.puts "\u{251c} Name: #{app}"
+        if config['auth_handler']
+          $stderr.puts "\u{2502}\t\u{251c} Auth:"
+          $stderr.puts "\u{2502}\t\u{2502}\t\u{2514} Handler:\t#{config['auth_handler']}"
+        end
+        if config['auth_read_only']
+          $stderr.puts "\u{2502}\t\u{251c} Auth:"
+          $stderr.puts "\u{2502}\t\u{2502}\t\u{2514} Read Only:\t#{config['auth_read_only']}"
+        end
+        if config['type']
+          $stderr.puts "\u{2502}\t\u{2514} Type: #{config['type']}"
+        end
+      end
+    end
+  end
 end