lockdown 0.6.3 → 0.7.0

data/tasks/spec.rake

@@ -0,0 +1,54 @@
+
+if HAVE_SPEC_RAKE_SPECTASK and not PROJ.spec.files.to_a.empty?
+require 'spec/rake/verify_rcov'
+
+namespace :spec do
+
+  desc 'Run all specs with basic output'
+  Spec::Rake::SpecTask.new(:run) do |t|
+    t.ruby_opts = PROJ.ruby_opts
+    t.spec_opts = PROJ.spec.opts
+    t.spec_files = PROJ.spec.files
+    t.libs += PROJ.libs
+  end
+
+  desc 'Run all specs with text output'
+  Spec::Rake::SpecTask.new(:specdoc) do |t|
+    t.ruby_opts = PROJ.ruby_opts
+    t.spec_opts = PROJ.spec.opts + ['--format', 'specdoc']
+    t.spec_files = PROJ.spec.files
+    t.libs += PROJ.libs
+  end
+
+  if HAVE_RCOV
+    desc 'Run all specs with RCov'
+    Spec::Rake::SpecTask.new(:rcov) do |t|
+      t.ruby_opts = PROJ.ruby_opts
+      t.spec_opts = PROJ.spec.opts
+      t.spec_files = PROJ.spec.files
+      t.libs += PROJ.libs
+      t.rcov = true
+      t.rcov_dir = PROJ.rcov.dir
+      t.rcov_opts = PROJ.rcov.opts + ['--exclude', 'spec']
+    end
+
+    RCov::VerifyTask.new(:verify) do |t| 
+      t.threshold = PROJ.rcov.threshold
+      t.index_html = File.join(PROJ.rcov.dir, 'index.html')
+      t.require_exact_threshold = PROJ.rcov.threshold_exact
+    end
+
+    task :verify => :rcov
+    remove_desc_for_task %w(spec:clobber_rcov)
+  end
+
+end  # namespace :spec
+
+desc 'Alias to spec:run'
+task :spec => 'spec:run'
+
+task :clobber => 'spec:clobber_rcov' if HAVE_RCOV
+
+end  # if HAVE_SPEC_RAKE_SPECTASK
+
+# EOF

data/tasks/svn.rake

@@ -0,0 +1,47 @@
+
+if HAVE_SVN
+
+unless PROJ.svn.root
+  info = %x/svn info ./
+  m = %r/^Repository Root:\s+(.*)$/.match(info)
+  PROJ.svn.root = (m.nil? ? '' : m[1])
+end
+PROJ.svn.root = File.join(PROJ.svn.root, PROJ.svn.path) unless PROJ.svn.path.empty?
+
+namespace :svn do
+
+  # A prerequisites task that all other tasks depend upon
+  task :prereqs
+
+  desc 'Show tags from the SVN repository'
+  task :show_tags => 'svn:prereqs' do |t|
+    tags = %x/svn list #{File.join(PROJ.svn.root, PROJ.svn.tags)}/
+    tags.gsub!(%r/\/$/, '')
+    tags = tags.split("\n").sort {|a,b| b <=> a}
+    puts tags
+  end
+
+  desc 'Create a new tag in the SVN repository'
+  task :create_tag => 'svn:prereqs' do |t|
+    v = ENV['VERSION'] or abort 'Must supply VERSION=x.y.z'
+    abort "Versions don't match #{v} vs #{PROJ.version}" if v != PROJ.version
+
+    svn = PROJ.svn
+    trunk = File.join(svn.root, svn.trunk)
+    tag = "%s-%s" % [PROJ.name, PROJ.version]
+    tag = File.join(svn.root, svn.tags, tag)
+    msg = "Creating tag for #{PROJ.name} version #{PROJ.version}"
+
+    puts "Creating SVN tag '#{tag}'"
+    unless system "svn cp -m '#{msg}' #{trunk} #{tag}"
+      abort "Tag creation failed" 
+    end
+  end
+
+end  # namespace :svn
+
+task 'gem:release' => 'svn:create_tag'
+
+end  # if PROJ.svn.path
+
+# EOF

data/tasks/test.rake

@@ -0,0 +1,40 @@
+
+if test(?e, PROJ.test.file) or not PROJ.test.files.to_a.empty?
+require 'rake/testtask'
+
+namespace :test do
+
+  Rake::TestTask.new(:run) do |t|
+    t.libs = PROJ.libs
+    t.test_files = if test(?f, PROJ.test.file) then [PROJ.test.file]
+                   else PROJ.test.files end
+    t.ruby_opts += PROJ.ruby_opts
+    t.ruby_opts += PROJ.test.opts
+  end
+
+  if HAVE_RCOV
+    desc 'Run rcov on the unit tests'
+    task :rcov => :clobber_rcov do
+      opts = PROJ.rcov.opts.dup << '-o' << PROJ.rcov.dir
+      opts = opts.join(' ')
+      files = if test(?f, PROJ.test.file) then [PROJ.test.file]
+              else PROJ.test.files end
+      files = files.join(' ')
+      sh "#{RCOV} #{files} #{opts}"
+    end
+
+    task :clobber_rcov do
+      rm_r 'coverage' rescue nil
+    end
+  end
+
+end  # namespace :test
+
+desc 'Alias to test:run'
+task :test => 'test:run'
+
+task :clobber => 'test:clobber_rcov' if HAVE_RCOV
+
+end
+
+# EOF

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lockdown
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors: 
 - Andrew Stone
@@ -9,65 +9,34 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-02 00:00:00 -05:00
+date: 2009-01-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: classy-inheritance
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.6.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: newgem
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
+  name: bones
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 2.1.1
     version: 
-description: Lockdown is a authentication/authorization system for RubyOnRails. (Merb compatibility coming soon).  For more information please visit stonean.com
-email: 
-- andy@stonean.com
-executables: 
-- lockdown
+description: Lockdown is a authentication/authorization system for RubyOnRails (ver >= 2.1).
+email: andy@stonean.com
+executables: []
+
 extensions: []
 
 extra_rdoc_files: 
 - History.txt
-- License.txt
-- Manifest.txt
-- PostInstall.txt
 - README.txt
-- website/index.txt
 files: 
+- .gitignore
 - History.txt
-- License.txt
 - Manifest.txt
-- PostInstall.txt
 - README.txt
 - Rakefile
-- app_generators/lockdown/USAGE
-- app_generators/lockdown/lockdown_generator.rb
-- app_generators/lockdown/templates/init.rb
-- app_generators/lockdown/templates/session.rb
-- bin/lockdown
 - lib/lockdown.rb
 - lib/lockdown/classy-inheritance.rb
 - lib/lockdown/controller.rb
@@ -84,8 +53,6 @@ files:
 - lib/lockdown/rights.rb
 - lib/lockdown/session.rb
 - lib/lockdown/system.rb
-- lib/lockdown/version.rb
-- rails_generators/lockdown/USAGE
 - rails_generators/lockdown/lockdown_generator.rb
 - rails_generators/lockdown/templates/app/controllers/permissions_controller.rb
 - rails_generators/lockdown/templates/app/controllers/sessions_controller.rb
@@ -98,47 +65,41 @@ files:
 - rails_generators/lockdown/templates/app/models/profile.rb
 - rails_generators/lockdown/templates/app/models/user.rb
 - rails_generators/lockdown/templates/app/models/user_group.rb
-- rails_generators/lockdown/templates/app/views/permissions/_data.html.erb
 - rails_generators/lockdown/templates/app/views/permissions/index.html.erb
 - rails_generators/lockdown/templates/app/views/permissions/show.html.erb
 - rails_generators/lockdown/templates/app/views/sessions/new.html.erb
-- rails_generators/lockdown/templates/app/views/user_groups/_data.html.erb
-- rails_generators/lockdown/templates/app/views/user_groups/_form.html.erb
 - rails_generators/lockdown/templates/app/views/user_groups/edit.html.erb
 - rails_generators/lockdown/templates/app/views/user_groups/index.html.erb
 - rails_generators/lockdown/templates/app/views/user_groups/new.html.erb
 - rails_generators/lockdown/templates/app/views/user_groups/show.html.erb
-- rails_generators/lockdown/templates/app/views/users/_data.html.erb
-- rails_generators/lockdown/templates/app/views/users/_form.html.erb
 - rails_generators/lockdown/templates/app/views/users/edit.html.erb
 - rails_generators/lockdown/templates/app/views/users/index.html.erb
 - rails_generators/lockdown/templates/app/views/users/new.html.erb
 - rails_generators/lockdown/templates/app/views/users/show.html.erb
+- rails_generators/lockdown/templates/config/initializers/lockit.rb
 - rails_generators/lockdown/templates/db/migrate/create_admin_user.rb
 - rails_generators/lockdown/templates/db/migrate/create_permissions.rb
 - rails_generators/lockdown/templates/db/migrate/create_profiles.rb
 - rails_generators/lockdown/templates/db/migrate/create_user_groups.rb
 - rails_generators/lockdown/templates/db/migrate/create_users.rb
-- script/console
-- script/destroy
-- script/generate
-- script/txt2html
-- setup.rb
-- test/test_generator_helper.rb
-- test/test_helper.rb
-- test/test_lockdown.rb
-- test/test_lockdown_all_generator.rb
-- test/test_lockdown_generator.rb
-- test/test_lockdown_models_generator.rb
-- website/index.html
-- website/index.txt
-- website/javascripts/rounded_corners_lite.inc.js
-- website/model.jpg
-- website/stylesheets/screen.css
-- website/template.html.erb
+- rails_generators/lockdown/templates/lib/lockdown/init.rb
+- rails_generators/lockdown/templates/lib/lockdown/session.rb
+- tasks/ann.rake
+- tasks/bones.rake
+- tasks/gem.rake
+- tasks/git.rake
+- tasks/manifest.rake
+- tasks/notes.rake
+- tasks/post_load.rake
+- tasks/rdoc.rake
+- tasks/rubyforge.rake
+- tasks/setup.rb
+- tasks/spec.rake
+- tasks/svn.rake
+- tasks/test.rake
 has_rdoc: true
 homepage: http://stonean.com/wiki/lockdown
-post_install_message: PostInstall.txt
+post_install_message: 
 rdoc_options: 
 - --main
 - README.txt
@@ -162,11 +123,6 @@ rubyforge_project: lockdown
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: Lockdown is a authentication/authorization system for RubyOnRails
-test_files: 
-- test/test_generator_helper.rb
-- test/test_helper.rb
-- test/test_lockdown.rb
-- test/test_lockdown_all_generator.rb
-- test/test_lockdown_generator.rb
-- test/test_lockdown_models_generator.rb
+summary: Lockdown is a authentication/authorization system for RubyOnRails (ver >= 2
+test_files: []
+

data/License.txt

@@ -1,20 +0,0 @@
-Copyright (c) 2008 FIXME full name
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/PostInstall.txt

@@ -1,3 +0,0 @@
-
-For more information on lockdown, see http://stonean.com
-

data/app_generators/lockdown/USAGE

@@ -1,5 +0,0 @@
-Description:
-  
-  
-Usage:
-  

data/app_generators/lockdown/lockdown_generator.rb

@@ -1,25 +0,0 @@
-class LockdownGenerator < RubiGen::Base
-  
-  DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
-                              Config::CONFIG['ruby_install_name'])
-  
-  default_options :author => "Andrew Stone"
-  
-  attr_reader :name, :framework
-  
-  def initialize(runtime_args, runtime_options = {})
-    super
-    usage if args.empty?
-    @destination_root = File.expand_path(args.shift)
-    @name = base_name
-    @framework = runtime_options[:framework]
-  end
-
-  def manifest
-    record do |m|
-      m.directory "lib/lockdown"
-      m.template "session.rb", "lib/lockdown/session.rb"
-      m.file "init.rb", "lib/lockdown/init.rb"
-    end
-  end
-end

data/bin/lockdown

@@ -1,132 +0,0 @@
-#!/usr/bin/env ruby
-
-require "rubygems"
-require "rubigen"
-require "rubigen/scripts/generate"
-require 'optparse'
-
-if %w(-v --version).include? ARGV.first
-  require 'lockdown/version'
-  puts "#{File.basename($0)} #{Lockdown::VERSION::STRING}"
-  exit(0)
-end
-
-MERB_CONFIG = 'config/init.rb'
-RAILS_CONFIG = 'config/environment.rb'
-
-if File.exists?(MERB_CONFIG)
-  @framework = "merb"
-elsif File.exists?(RAILS_CONFIG)
-  @framework = "rails"
-else
-  raise NotImplementedError, "Configuration file not found.  Looking for init.rb (Merb) or environment.rb (Rails)"
-end
-
-def merb_app?
-  @framework == "merb"
-end
-
-def rails_app?
-  @framework == "rails"
-end
-
-#
-# Right now we only have the two and we raise an exception
-# if we don't know prior to getting here..
-#
-def config_file
-  if merb_app?
-    MERB_CONFIG
-  else
-    RAILS_CONFIG
-  end
-end
-
-begin
-  require 'rubygems'
-rescue LoadError
-  # no rubygems to load, so we fail silently
-end
-
-
-OPTIONS = {
-  :path     => File.expand_path('.')
-}
-
-parser = OptionParser.new do |opts|
-  opts.banner = <<-BANNER
-    Lockdown will add init.rb and session.rb to the lib/lockdown directory and require them in #{config_file}.
-
-    Usage: #{File.basename($0)} [options]
-
-    Options are:
-    BANNER
-
-  opts.separator ""
-  opts.on("-p", "--path=PATH", String,
-    "The root path for selecting files",
-    "Default: [current directory]") { |OPTIONS[:path]| }
-  opts.on("-h", "--help",
-    "Show this help message.") { puts opts; exit }
-  opts.parse!(ARGV)
-end 
-
-#
-# Load up the config file contents
-#
-@configuration = File.open config_file do |f|
-  f.map {|line| line.chomp}
-end
-
-def configuration_file_has?(req)
-  @configuration.include?(req)
-end
-
-puts <<-MSG
-\n------------------------------------------------------------
-Installing Lockdown
-MSG
-
-begin
-  source = RubiGen::PathSource.new(:application,
-    File.join(File.dirname(__FILE__), "../app_generators"))
-  RubiGen::Base.reset_sources
-  RubiGen::Base.append_sources source
-  RubiGen::Scripts::Generate.new.run(ARGV, :generator => 'lockdown', :framework => @framework)
-
-  File.open(config_file, "a") do |f|
-    require_lockdown =  %Q(require "lockdown/init")
-
-    f << %Q(\n#{require_lockdown}\n) unless configuration_file_has?(require_lockdown)
-  end
-rescue Exception => e
-  puts e.backtrace.join("\n")
-  raise e
-end
-
-puts <<-MSG
-------------------------------------------------------------\n
-MSG
-
-puts <<-MSG
-\n------------------------------------------------------------
-Modified #{config_file} by adding:
-    require "lockdown/init"
-------------------------------------------------------------\n
-MSG
-
-puts <<-MSG
-\n------------------------------------------------------------
-You are now locked down.  To open up access to your 
-application please modify lib/lockdown/init.rb.  This is 
-where you'll add permissions and create user groups.
-
-To modify the contents of your session and to add access 
-methods, modify lib/lockdown/session.rb.
-
-For the wiki, news, forum and issue tracker please visit:
-
-http://stonean.com/projects/show/lockdown
-
-------------------------------------------------------------\n
-MSG