README_FOR_APP @@ -25,7 +25,7 @@ if Object.const_defined?(:Gem) # Change these as appropriate s.name = "vanilla" - s.version = "1.9.10" + s.version = "1.9.11" s.summary = "A bliki-type web content thing." s.author = "James Adam" s.email = "james@lazyatom.com.com" @@ -36,7 +36,7 @@ if Object.const_defined?(:Gem) s.rdoc_options = %w(--main README) # Add any extra files to include in the gem - s.files = %w(config.example.yml config.ru Rakefile README) + Dir.glob("{spec,lib,bin,public}/**/*") + s.files = %w(config.example.yml config.ru Rakefile README README_FOR_APP) + Dir.glob("{spec,lib,bin,public}/**/*") s.executables = ['vanilla'] s.require_paths = ["lib"] Rakefile @@ -1,6 +1,3 @@ --- -:filename: config.example.yml :soup: soup :secret: a6bc097eff86cabd92ee72ba4687c3f057b7556deaa3e4a6b284460871056b87ba3e91548c37dcc44fbc10241cee5b386556e6bcc2946fd9b609dc3bc1b24488 -:credentials: - admin: 5f4dcc3b5aa765d61d8327deb882cf99 config.example.yml @@ -14,13 +14,12 @@ namespace :vanilla do task :load_snips do app = Vanilla::App.new(ENV['VANILLA_CONFIG']) + print "Preparing soup... " Dynasnip.all.each { |ds| app.soup << ds.snip_attributes } - Dir[File.join(File.dirname(__FILE__), '..', 'vanilla', 'snips', '*.rb')].each do |f| load f - end - - puts "The soup is simmering." + end + puts "the soup is simmering." end desc 'Resets the soup to contain the base snips only. Dangerous!' @@ -88,6 +87,7 @@ namespace :vanilla do desc 'Generate file containing secret for cookie-based session storage' task :generate_secret do + print "Generating cookie secret... " # Adapted from old rails secret generator. require 'openssl' if !File.exist?("/dev/urandom") @@ -104,12 +104,14 @@ namespace :vanilla do app = Vanilla::App.new(ENV['VANILLA_CONFIG']) app.config[:secret] = secret app.config.save! - puts "Secret generated." + puts "done; cookies are twice baked. BIS-CUIT!" end desc 'Prepare standard files to run Vanilla' task :prepare_files do cp File.expand_path(File.join(File.dirname(__FILE__), *%w[.. .. config.ru])), 'config.ru' + cp File.expand_path(File.join(File.dirname(__FILE__), *%w[.. .. config.example.yml])), 'config.yml' + cp File.expand_path(File.join(File.dirname(__FILE__), *%w[.. .. README_FOR_APP])), 'README' cp_r File.expand_path(File.join(File.dirname(__FILE__), *%w[.. .. public])), 'public' mkdir 'tmp' File.open("Rakefile", "w") do |f| @@ -127,47 +129,21 @@ EOF desc 'Prepare a new vanilla.rb installation' task :setup do puts <<-EOM +____________________.c( Vanilla.rb )o._____________________ - ===================~ Vanilla.rb ~==================== - - Congratulations! You have elected to try out the weirdest web thing ever. - Lets get started. Firstly, I'm going to cook you some soup: - - - EOM - Rake::Task['vanilla:load_snips'].invoke - - puts <<-EOM - - Now I'm going to generate your configuration. This will be stored either in - 'config.yml' in the current directory, or in the path you provide via the - environment variable VANILLA_CONFIG. - - Generating the secret for cookie-based session storage. - EOM - Rake::Task['vanilla:prepare_files'].invoke - Rake::Task['vanilla:generate_secret'].invoke - - puts <<-EOM - - - Now that we've got our broth, you'll want to add a user, so you can edit stuff. - Lets do that now: +Congratulations! You have elected to try out the weirdest web +thing ever. Lets get started. +EOM + Rake::Task['vanilla:prepare_files'].invoke + Rake::Task['vanilla:generate_secret'].invoke + Rake::Task['vanilla:load_snips'].invoke - EOM - Rake::Task['vanilla:add_user'].invoke - puts <<-EOM - + puts <<-EOM - OK! You're ready to go. To start vanilla.rb, you'll want to get it running under - a webserver that supports Rack. The easiest way to do this locally is via 'rackup': - - $ rackup - - Then go to http://localhost:9292 +___________________.c( You Are Ready )o.___________________ - I'm going now, Goodbye! +#{File.readlines('README')[0,16].join} EOM end -end \ No newline at end of file +end lib/tasks/vanilla.rake @@ -2,7 +2,7 @@ Gem::Specification.new do |s| s.name = %q{vanilla} - s.version = "1.9.10" + s.version = "1.9.11" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["James Adam"] @@ -11,7 +11,7 @@ Gem::Specification.new do |s| s.email = %q{james@lazyatom.com.com} s.executables = ["vanilla"] s.extra_rdoc_files = ["README"] - s.files = ["config.example.yml", "config.ru", "Rakefile", "README", "spec/dynasnip_spec.rb", "spec/renderers", "spec/renderers/base_renderer_spec.rb", "spec/renderers/erb_renderer_spec.rb", "spec/renderers/markdown_renderer_spec.rb", "spec/renderers/raw_renderer_spec.rb", "spec/renderers/ruby_renderer_spec.rb", "spec/renderers/vanilla_app_detecting_renderer_spec.rb", "spec/spec_helper.rb", "spec/tmp", "spec/tmp/config.yml", "spec/tmp/soup", "spec/tmp/soup/current_snip.yml", "spec/tmp/soup/system.yml", "spec/vanilla_app_spec.rb", "spec/vanilla_presenting_spec.rb", "spec/vanilla_request_spec.rb", "lib/defensio.rb", "lib/tasks", "lib/tasks/vanilla.rake", "lib/vanilla", "lib/vanilla/app.rb", "lib/vanilla/console.rb", "lib/vanilla/dynasnip.rb", "lib/vanilla/dynasnips", "lib/vanilla/dynasnips/comments.rb", "lib/vanilla/dynasnips/current_snip.rb", "lib/vanilla/dynasnips/debug.rb", "lib/vanilla/dynasnips/edit.rb", "lib/vanilla/dynasnips/edit_link.rb", "lib/vanilla/dynasnips/index.rb", "lib/vanilla/dynasnips/kind.rb", "lib/vanilla/dynasnips/link_to.rb", "lib/vanilla/dynasnips/link_to_current_snip.rb", "lib/vanilla/dynasnips/login.rb", "lib/vanilla/dynasnips/new.rb", "lib/vanilla/dynasnips/notes.rb", "lib/vanilla/dynasnips/pre.rb", "lib/vanilla/dynasnips/rand.rb", "lib/vanilla/dynasnips/raw.rb", "lib/vanilla/dynasnips/url_to.rb", "lib/vanilla/renderers", "lib/vanilla/renderers/base.rb", "lib/vanilla/renderers/bold.rb", "lib/vanilla/renderers/erb.rb", "lib/vanilla/renderers/markdown.rb", "lib/vanilla/renderers/raw.rb", "lib/vanilla/renderers/ruby.rb", "lib/vanilla/renderers/textile.rb", "lib/vanilla/request.rb", "lib/vanilla/routes.rb", "lib/vanilla/snip_reference.rb", "lib/vanilla/snip_reference.treetop", "lib/vanilla/snip_reference_parser.rb", "lib/vanilla/snips", "lib/vanilla/snips/start.rb", "lib/vanilla/snips/system.rb", "lib/vanilla/snips/tutorial.rb", "lib/vanilla/soup_with_timestamps.rb", "lib/vanilla.rb", "bin/vanilla", "public/hatch.png", "public/javascripts", "public/javascripts/jquery.autogrow-textarea.js", "public/javascripts/jquery.js", "public/javascripts/vanilla.js"] + s.files = ["config.example.yml", "config.ru", "Rakefile", "README", "README_FOR_APP", "spec/dynasnip_spec.rb", "spec/renderers", "spec/renderers/base_renderer_spec.rb", "spec/renderers/erb_renderer_spec.rb", "spec/renderers/markdown_renderer_spec.rb", "spec/renderers/raw_renderer_spec.rb", "spec/renderers/ruby_renderer_spec.rb", "spec/renderers/vanilla_app_detecting_renderer_spec.rb", "spec/spec_helper.rb", "spec/tmp", "spec/tmp/config.yml", "spec/tmp/soup", "spec/tmp/soup/current_snip.yml", "spec/tmp/soup/system.yml", "spec/vanilla_app_spec.rb", "spec/vanilla_presenting_spec.rb", "spec/vanilla_request_spec.rb", "lib/defensio.rb", "lib/tasks", "lib/tasks/vanilla.rake", "lib/vanilla", "lib/vanilla/app.rb", "lib/vanilla/console.rb", "lib/vanilla/dynasnip.rb", "lib/vanilla/dynasnips", "lib/vanilla/dynasnips/comments.rb", "lib/vanilla/dynasnips/current_snip.rb", "lib/vanilla/dynasnips/debug.rb", "lib/vanilla/dynasnips/edit.rb", "lib/vanilla/dynasnips/edit_link.rb", "lib/vanilla/dynasnips/index.rb", "lib/vanilla/dynasnips/kind.rb", "lib/vanilla/dynasnips/link_to.rb", "lib/vanilla/dynasnips/link_to_current_snip.rb", "lib/vanilla/dynasnips/login.rb", "lib/vanilla/dynasnips/new.rb", "lib/vanilla/dynasnips/notes.rb", "lib/vanilla/dynasnips/pre.rb", "lib/vanilla/dynasnips/rand.rb", "lib/vanilla/dynasnips/raw.rb", "lib/vanilla/dynasnips/url_to.rb", "lib/vanilla/renderers", "lib/vanilla/renderers/base.rb", "lib/vanilla/renderers/bold.rb", "lib/vanilla/renderers/erb.rb", "lib/vanilla/renderers/markdown.rb", "lib/vanilla/renderers/raw.rb", "lib/vanilla/renderers/ruby.rb", "lib/vanilla/renderers/textile.rb", "lib/vanilla/request.rb", "lib/vanilla/routes.rb", "lib/vanilla/snip_reference.rb", "lib/vanilla/snip_reference.treetop", "lib/vanilla/snip_reference_parser.rb", "lib/vanilla/snips", "lib/vanilla/snips/start.rb", "lib/vanilla/snips/system.rb", "lib/vanilla/snips/tutorial.rb", "lib/vanilla/soup_with_timestamps.rb", "lib/vanilla.rb", "bin/vanilla", "public/hatch.png", "public/javascripts", "public/javascripts/jquery.autogrow-textarea.js", "public/javascripts/jquery.js", "public/javascripts/vanilla.js"] s.homepage = %q{http://github.com/lazyatom/vanilla-rb} s.rdoc_options = ["--main", "README"] s.require_paths = ["lib"] vanilla.gemspec cb325fc91022611bf5fa304d49dccd6ba0547a4e James Adam james@lazyatom.com http://github.com/lazyatom/vanilla-rb/commit/ca1299db94c7703da75079f32308a93926a0adaa ca1299db94c7703da75079f32308a93926a0adaa 2009-10-13T05:02:06-07:00 2009-10-13T05:02:06-07:00 Prepared more documentation for generating a new vanilla app. 210d2ed24554b7d49c6aa20d3f0223df80ae937a James Adam james@lazyatom.com