Changeset 1056 for lang/ruby

Timestamp:

11/03/07 15:32:20 (6 years ago)

Author:

cho45

Message:

lang/ruby/ekfloras/Rakefile,
lang/ruby/ekfloras/ekfloras.rb:

とりあえず config よむように

Location:

lang/ruby/ekfloras

Files:

• . (modified) (1 prop)
• Rakefile (modified) (3 diffs)
• ekfloras.rb (modified) (4 diffs)

lang/ruby/ekfloras

@@ -1 +1 @@
 ekfloras.cgi
 data
+pkg
+config.yaml.sample
+config.yaml
+

@@ -1 +1 @@
 ekfloras.cgi
 data
+pkg
+config.yaml.sample
+config.yaml
+

lang/ruby/ekfloras/Rakefile

@@ -2 +2 @@
 require "rubygems"
 require "rake"
+require "rake/clean"
+
+CLEAN.include ["config.yaml.sample"]
 
 task :default => [:test]
@@ -9 +12 @@
 end
 
-task :package => "pkg" do
+task :package => ["pkg", "config.yaml.sample"] do
         version = Time.now.strftime("%Y-%m-%d")
         dir = "ekfloras.#{version}"
@@ -16 +19 @@
                 mkdir #{dir}
                 cp ekfloras.rb #{dir}/ekfloras.cgi
-                cp ekfloras.rb template.* #{dir}
+                cp ekfloras.rb template.* config.yaml.sample #{dir}
                 cp -r plugins #{dir}
                 cp -r lib #{dir}
                 tar -cvzf #{dir}.tar.gz #{dir}
                 mv #{dir}.tar.gz pkg/
+                rm -rf #{dir}
         }
 end
 
+task :gconfig => ["clean", "config.yaml.sample"] do
+        puts File.read("config.yaml.sample")
+end
+
+file "config.yaml.sample" => ["ekfloras.rb"] do |t|
+        File.open(t.name, "wb") {|f| f << `ruby ekfloras.rb gen-default-config` }
+end
+
 directory "pkg"

lang/ruby/ekfloras/ekfloras.rb

@@ -8 +8 @@
 require "ostruct"
 require "minierb"
+require "yaml"
 
 class Ekfloras
         DEFAULT_OPTS = {
-                :title      => "Ekfloras test",
+                :title      => "Ekfloras blogging",
                 :flavour    => ".html",
                 :data_dir   => "data",
@@ -64 +65 @@
         attr_reader :plugins
 
-        def initialize(cgi, opts=DEFAULT_OPTS.dup)
+        def initialize(cgi, opts={})
                 @cgi             = cgi
-                @opts            = opts
+                @opts            = DEFAULT_OPTS.merge(opts)
                 @opts[:data_dir] = Pathname.new(@opts[:data_dir])
-                @data            = Pathname.new(opts[:data_dir])
+                @data            = Pathname.new(@opts[:data_dir])
                 @home            = @cgi.script_name
                 @server_root     = @cgi.server_name
@@ -189 +190 @@
 end
 
+if ARGV.first == "gen-default-config"
+        puts YAML.dump(Ekfloras::DEFAULT_OPTS)
+        exit
+end
+
 if $stdout.tty?
         Ekfloras.new(OpenStruct.new({
@@ -198 +204 @@
         })).run
 else
-        Ekfloras.new(CGI.new).run
+        begin
+                opts = File.open("config.yaml") {|f| YAML.load(f) }
+                Ekfloras.new(CGI.new, opts).run
+        rescue Errno::ENOENT
+                Ekfloras.new(CGI.new).run
+        end
 end

@@ -1 +1 @@
 ekfloras.cgi
 data
+pkg
+config.yaml.sample
+config.yaml
+