170 Implement unscaffold subcommand for automatic-config, show message when loading recipe, fix CI problem

id774 · id774 · commit 574f213f457d · 2012-06-14T10:42:00.000+09:00
diff --git a/bin/automatic-config b/bin/automatic-config
@@ -13,6 +13,9 @@ $:.unshift root_dir + '/lib'
 require 'automatic'
 require 'rubygems'
 require 'optparse'
+require 'fileutils'
+require 'feedbag'
+require 'pp'
 
 parser = OptionParser.new { |opt|
 }
@@ -25,7 +28,6 @@ end
 
 subparsers = {
   'scaffold' => lambda { |argv|
-    require 'fileutils'
     Dir::entries(root_dir + '/plugins').sort.each { |path|
       dir = (File.expand_path('~/.automatic/plugins/' + path))
       unless File.exist?(dir)
@@ -46,39 +48,42 @@ subparsers = {
       puts "Create Directory #{dir}"
     end
   },
+  'unscaffold' => lambda { |argv|
+    dir = (File.expand_path('~/.automatic'))
+    if File.directory?(dir)
+      puts "Remove Directory #{dir}"
+      FileUtils.rm_r(dir)
+    end
+  },
   'autodiscovery' => lambda { |argv|
-    require 'pp'
-    require 'feedbag'
     url = argv.shift || abort_with_usage("autodiscovery", "<url>")
     pp Feedbag.find(url)
   },
-  'opmlparser' => lambda { |argv|
-    require 'automatic/opml'
-    path = argv.shift
-    if path.nil?
-      abort_with_usage("opmlparser", "<opml path>")
-    end
-    parser = Automatic::OPML::Parser.new(File.read(path))
-    parser.each_outline {|opml, o|
-      puts "#{o.xmlUrl}"
-    }
-  },
   'feedparser' => lambda { |argv|
-    require 'pp'
     require 'automatic/feed_parser'
     url = argv.shift || abort_with_usage("feedparser", "<url>")
     rss_results = Automatic::FeedParser.get_rss(url)
     pp rss_results
   },
   'inspect' => lambda { |argv|
     require 'automatic/feed_parser'
-    require 'feedbag'
     url = argv.shift || abort_with_usage("inspect", "<url>")
     feeds = Feedbag.find(url)
     pp feeds
     rss_results = Automatic::FeedParser.get_rss(feeds.pop)
     pp rss_results
   },
+  'opmlparser' => lambda { |argv|
+    require 'automatic/opml'
+    pathh = argv.shift
+    if path.nil?
+      abort_with_usage("opmlparser", "<opml path>")
+    end
+    parser = Automatic::OPML::Parser.new(File.read(path))
+    parser.each_outline {|opml, o|
+      puts "#{o.xmlUrl}"
+    }
+  },
   'log' => lambda { |argv|
     require 'automatic/log'
     level = argv.shift || abort_with_usage("log", "<level> <message>")
diff --git a/lib/automatic/recipe.rb b/lib/automatic/recipe.rb
@@ -18,9 +18,8 @@ def initialize(path = "")
 
     def load_recipe(path)
       dir = File.join((File.expand_path('~/.automatic/config/')), path)
-      if File.exist?(dir)
-        path = dir
-      end
+      path = dir if File.exist?(dir)
+      Automatic::Log.puts("info", "Loading: #{path}")
       @procedure = Hashie::Mash.new(YAML.load(File.read(path)))
     end
 
diff --git a/script/build b/script/build
@@ -44,8 +44,13 @@ test_config() {
     $RACK_ROOT/bin/automatic-config $*
 }
 
-added_tests() {
+test_scaffold() {
     test_config scaffold
+    test_config unscaffold
+}
+
+added_tests() {
+    test -f $HOME/.automatic || test_scaffold
     test_config autodiscovery http://blog.id774.net/blogs/
     test_config opmlparser "$RACK_ROOT/test/fixtures/sampleOPML.xml"
     test_config feedparser http://blog.id774.net/blogs/feed/ > /dev/null
