junebug 0.0.13 → 0.0.14

data/CHANGELOG

@@ -1,3 +1,10 @@
+v0.0.14 2006-11-14
+
+ * Page title cleanup
+ * Rake task reorg
+ * Dump task
+ * Added error checking to generator
+
 v0.0.13 2006-11-14
 
  * Link style improvement/simplification

data/README

@@ -32,11 +32,17 @@ To create your Junebug wiki:
 This creates a directory 'testwiki' with the necessary files.
 
 > cd testwiki
-> ./wiki start
+> ./wiki run
 
 View your new wiki at: http://localhost:3301
 
-You can change default configuration (host, port, startpage, etc.. ) by editing the config.yml file
+Once everything seems to be running fine, you can set the wiki to run in the background.  Hit ctrl-C to kill the wiki, and then type
+
+> ./wiki start
+
+You can change default configuration (host, port, startpage, etc.. ) by editing the config.yml file.  For the changes to take effect, just restart the wiki:
+
+> ./wiki restart
 
 
 == Notes

data/Rakefile

@@ -2,17 +2,16 @@ $:.unshift './lib'
 
 require 'rubygems'
 require 'rake'
+
 require 'rake/gempackagetask'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-require 'active_record'
-
 Gem.manage_gems
 
 gem_spec = Gem::Specification.new do |s|
   s.name = 'junebug'
-  s.version = '0.0.13'
+  s.version = '0.0.14'
   s.summary = "Junebug is a minimalist ruby wiki."
   s.description = "Junebug is a minimalist ruby wiki running on Camping."
   s.author = "Tim Myrtle"
@@ -22,7 +21,7 @@ gem_spec = Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.bindir = 'bin'
   s.executables = ['junebug']
-  s.files = FileList['README','LICENSE','CHANGELOG','Rakefile','lib/**/*','deploy/**/*','fixtures/**/*']
+  s.files = FileList['README','LICENSE','CHANGELOG','Rakefile','lib/**/*','deploy/**/*','dump/**/*']
   s.test_files = FileList['test/**/*']
 
   s.add_dependency('mongrel', '>=0.3.13.4')
@@ -50,38 +49,11 @@ desc "Clean up directory"
 task :clean => :clobber_package do
   rm 'deploy/junebug.db', :force => true
   rm 'deploy/junebug.log', :force => true
+  Dir['deploy/dump/*'].each { |ext| rm ext }
   rm 'test/test.log', :force => true
 end
 
 
-desc 'Dump wiki pages'
-task :dump_pages do
-  fixtures_dir = File.join('.', 'fixtures')
-  
-  # clean out fixtures dir
-  puts "fixtures_dir: #{fixtures_dir}"
-  Dir[File.join(fixtures_dir, '*')].each { |f| rm_f(f, :verbose => false) }
-  
-  # open db connection
-  ActiveRecord::Base.establish_connection( :adapter => "sqlite3", :database  => "./deploy/junebug.db")
-  
-  # open fixtures file
-  File.open(File.join(fixtures_dir, "junebug_pages.yml"), 'w') do |file|
-    
-    # grab all pages
-    pages = Junebug::Models::Page.find(:all)
-    page_data = []
-    pages.each do |page|
-      page_data << page.attributes
-    end
-    
-    file.write page_data.to_yaml
-  end
-  
-  puts "Got pages and put them in #{fixtures_dir}."
-end
-
-
 desc 'Test the campground.'
 Rake::TestTask.new(:test) do |t|
 #  t.libs << 'lib'

data/deploy/Rakefile

@@ -3,28 +3,8 @@ $:.unshift "../lib"
 require 'rubygems'
 require 'rake'
 
-require 'junebug/config'
+require 'junebug/tasks'
 
-namespace :update do
-  
-  desc "Update stylesheets"
-  task :stylesheets do
-    junebug_root = Junebug::Config.rootdir
-    cp_r File.join(junebug_root, 'deploy', 'static'), '.'
-  end
-
-  desc "Update rakefile"
-  task :rakefile do
-    junebug_root = Junebug::Config.rootdir
-    cp File.join(junebug_root, 'deploy', 'Rakefile'), '.'
-  end
-
-  desc "Update everything"
-  task :everything => [:stylesheets, :rakefile] do
-
-  end
-
-end
 
 
 

data/lib/junebug/controllers.rb

@@ -72,7 +72,7 @@ module Junebug::Controllers
 
   class List < R '/all/list'
     def get
-      @page_title = "#{Junebug.config['startpage']}: All Pages"
+      @page_title = "All Pages"
       @pages = Page.find :all, :order => 'title'
       render :list
     end

data/lib/junebug/generator.rb

@@ -27,7 +27,7 @@ Welcome to Junebug!
 To start your new wiki, do the following:
 
 > cd #{app}
-> ./wiki start
+> ./wiki run
 
 Open your browser to http://#{Junebug.config['host']}:#{Junebug.config['port']}#{Junebug.config['sitepath']}
 
@@ -36,6 +36,9 @@ Your admin account is:
 username: #{user.username}
 password: #{user.password}
 
+For more information about running and configuring Junebug,
+go to http://www.junebugwiki.com
+
 Submit bug reports to tim.myrtle@gmail.com
 
 EOS

data/lib/junebug/models.rb

@@ -1,5 +1,5 @@
 require 'active_record'
-require 'acts_as_versioned'
+require 'junebug/acts_as_versioned'
 
 module Junebug::Models
 
@@ -60,20 +60,28 @@ module Junebug::Models
       Page.reset_column_information
       
       # Create admin account
+      admin = User.new(:role => User::ROLE_ADMIN)
       if ENV['INTERACTIVE']
-        print "Create an initial user account\n"
-        print "\nEnter your username (3-30 chars, no spaces or punctuation): "
-        username = STDIN.gets.strip
-        print "\nEnter your password (5-30 chars, no spaces or punctuation): "
-        password = STDIN.gets.strip
+        loop {
+          print "Create an initial user account\n"
+          print "\nEnter your username (3-30 chars, no spaces or punctuation): "
+          admin.username = STDIN.gets.strip
+          print "\nEnter your password (5-30 chars, no spaces or punctuation): "
+          admin.password = STDIN.gets.strip
+          break if admin.valid?
+          puts "\nThe following errors were encountered:"
+          admin.errors.full_messages().each {|msg| puts "  #{msg}"}
+          puts
+        }
       else
-        username = 'admin'
-        password = 'password'
+        admin.username = 'admin'
+        admin.password = 'password'
       end
-      admin = User.create :username => username, :password => password, :role => User::ROLE_ADMIN
+      admin.save
       
       # Install some default pages
-      pages_file = File.dirname(__FILE__) + "/../../fixtures/junebug_pages.yml"
+      pages_file = File.dirname(__FILE__) + "/../../dump/junebug_pages.yml"
+      puts pages_file
       YAML.load_file(pages_file).each {|page_data|Page.create(page_data) } if File.exist?(pages_file)
     end
     def self.down

data/lib/junebug/tasks.rb

@@ -0,0 +1,4 @@
+$VERBOSE = nil
+
+# Load rakefile extensions
+Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].each { |ext| load ext }

data/lib/junebug/tasks/dump.rake

@@ -0,0 +1,34 @@
+require 'junebug'
+require 'junebug/models'
+require 'active_record'
+
+namespace :dump do
+
+  desc 'Dump wiki pages'
+  task :pages do
+    fixtures_dir = File.join('.', 'dump')
+  
+    # clean out fixtures dir
+    puts "fixtures_dir: #{fixtures_dir}"
+    Dir[File.join(fixtures_dir, '*')].each { |f| rm_f(f, :verbose => false) }
+  
+    # open db connection
+    ActiveRecord::Base.establish_connection( :adapter => "sqlite3", :database  => "./junebug.db")
+  
+    # open fixtures file
+    File.open(File.join(fixtures_dir, "junebug_pages.yml"), 'w') do |file|
+    
+      # grab all pages
+      pages = Junebug::Models::Page.find(:all)
+      page_data = []
+      pages.each do |page|
+        page_data << page.attributes
+      end
+    
+      file.write page_data.to_yaml
+    end
+  
+    puts "Got pages and put them in #{fixtures_dir}."
+  end
+
+end

data/lib/junebug/tasks/update.rake

@@ -0,0 +1,22 @@
+require 'junebug/config'
+
+namespace :update do
+  
+  desc "Update stylesheets"
+  task :stylesheets do
+    junebug_root = Junebug::Config.rootdir
+    cp_r File.join(junebug_root, 'deploy', 'static'), '.'
+  end
+
+  desc "Update rakefile"
+  task :rakefile do
+    junebug_root = Junebug::Config.rootdir
+    cp File.join(junebug_root, 'deploy', 'Rakefile'), '.'
+  end
+
+  desc "Update everything"
+  task :everything => [:stylesheets, :rakefile] do
+
+  end
+
+end

data/lib/junebug/views.rb

@@ -21,11 +21,11 @@ module Junebug::Views
   end
 
   def show
-    _header (@version.version == @page.version ? :show : :backlinks), @page.title
+    _header (@version.version == @page.version ? :backlinks : :show), @page.title
     _body {
       _button 'edit', R(Edit, @page.title, @version.version), {:style=>'float: right; margin: 0 0 5px 5px;'} if logged_in? && (@version.version == @page.version && (! @page.readonly || is_admin?))
       _markup @version.body
-      _button 'edit', R(Edit, @page.title, @version.version), {:style=>'float: right; margin: 5px 0 0 5px;'} if logged_in? && (@version.version == @page.version && (! @page.readonly || is_admin?)) && (@version.body && @version.body.size > 100)
+      _button 'edit', R(Edit, @page.title, @version.version), {:style=>'float: right; margin: 5px 0 0 5px;'} if logged_in? && (@version.version == @page.version && (! @page.readonly || is_admin?)) && (@version.body && @version.body.size > 200)
       br :clear=>'all'
     }
     _footer {
@@ -56,7 +56,7 @@ module Junebug::Views
   end
 
   def edit
-    _header :backlinks, @page.title
+    _header :show, @page.title
     _body {
       div.formbox {
         form :method => 'post', :action => R(Edit, @page.title) do
@@ -90,7 +90,7 @@ module Junebug::Views
   end
 
   def versions
-    _header :backlinks, @page.title
+    _header :show, @page.title
     _body {
       h1 @page_title
       ul {
@@ -115,7 +115,7 @@ module Junebug::Views
   end
 
   def backlinks
-    _header :static, @page.title
+    _header :show, @page.title
     _body {
       h1 "Backlinks to #{@page.title}"
       ul {
@@ -126,7 +126,7 @@ module Junebug::Views
   end
 
   def list
-    _header :backlinks, Junebug.config['startpage']
+    _header :static, @page_title
     _body {
       h1 "All Wiki Pages"
       ul {
@@ -164,7 +164,7 @@ module Junebug::Views
   end
   
   def diff
-    _header :backlinks, @page.title
+    _header :show, @page.title
     _body {
       text 'Comparing '
       span "version #{@v2.version}", :style=>"background-color: #cfc; padding: 1px 4px;"
@@ -226,7 +226,7 @@ module Junebug::Views
       end
       if type == :static
         h1 page_title
-      elsif type == :show
+      elsif type == :backlinks
         h1 { a page_title, :href => R(Backlinks, page_title) }
       else
         h1 { a page_title, :href => R(Show, page_title) }

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: junebug
 version: !ruby/object:Gem::Version 
-  version: 0.0.13
+  version: 0.0.14
 date: 2006-11-14 00:00:00 -08:00
 summary: Junebug is a minimalist ruby wiki.
 require_paths: 
@@ -33,9 +33,9 @@ files:
 - LICENSE
 - CHANGELOG
 - Rakefile
-- lib/acts_as_versioned.rb
 - lib/junebug
 - lib/junebug.rb
+- lib/junebug/acts_as_versioned.rb
 - lib/junebug/config.rb
 - lib/junebug/controllers.rb
 - lib/junebug/diff.rb
@@ -43,9 +43,14 @@ files:
 - lib/junebug/helpers.rb
 - lib/junebug/models.rb
 - lib/junebug/mosquito.rb
+- lib/junebug/tasks
+- lib/junebug/tasks.rb
 - lib/junebug/views.rb
+- lib/junebug/tasks/dump.rake
+- lib/junebug/tasks/update.rake
 - deploy/config.yml
 - deploy/console
+- deploy/dump
 - deploy/Rakefile
 - deploy/static
 - deploy/wiki
@@ -57,7 +62,7 @@ files:
 - deploy/static/style/yui/fonts.css
 - deploy/static/style/yui/grids.css
 - deploy/static/style/yui/reset.css
-- fixtures/junebug_pages.yml
+- dump/junebug_pages.yml
 test_files: 
 - test/fixtures
 - test/wiki_test.rb