adocsite 1.0.0 → 1.0.1

data/bin/adocsite

@@ -6,8 +6,7 @@ require 'commander/import'
 require 'bundler/setup'
 require 'adocsite'
 
-
-program :version, '1.0.0'
+program :version, Adocsite::VERSION
 program :description, 'Very simple static site generator for asciidoc documents'
 
 default_command :build

data/lib/adocsite/commands.rb

@@ -1,11 +1,7 @@
 module Adocsite
   class Commands
     def Commands.build(args, options)
-      user_config_file_name = options.config || "adocsite_config.rb"
-      user_config_file = File.join(Dir.pwd, user_config_file_name)
-      if File.exists?(user_config_file)
-        require user_config_file
-      end
+      Commands.load_config(args, options)
 
       engine = Adocsite::Engine.new
       engine.build(options.layout)
@@ -34,11 +30,7 @@ EOS
     end
 
     def Commands.post(args, options)
-      user_config_file_name = options.config || "adocsite_wp_config.rb"
-      user_config_file = File.join(Dir.pwd, user_config_file_name)
-      if File.exists?(user_config_file)
-        require user_config_file
-      end
+      Commands.load_config_wp(args, options)
 
       wp = Adocsite::WpPost.new
       
@@ -60,11 +52,7 @@ EOS
     end
 
     def Commands.list(args, options)
-      user_config_file_name = options.config || "adocsite_config.rb"
-      user_config_file = File.join(Dir.pwd, user_config_file_name)
-      if File.exists?(user_config_file)
-        require user_config_file
-      end
+      Commands.load_config(args, options)
 
       alist = Hash.new
       engine = Adocsite::Engine.new
@@ -78,6 +66,32 @@ EOS
 
       puts 'Done.'
     end
+    
+    def Commands.load_config(args, options)
+      user_config_file_name = options.config || "adocsite_config.rb"
+      user_config_file = File.join(Dir.pwd, user_config_file_name)
+      if File.exists?(user_config_file)
+        require user_config_file
+      else
+        user_config_file = File.join(Dir.home, ".adocsite")
+        if File.exists?(user_config_file)
+          require user_config_file
+        end
+      end
+    end
+    
+    def Commands.load_config_wp(args, options)
+      user_config_file_name = options.config || "adocsite_wp_config.rb"
+      user_config_file = File.join(Dir.pwd, user_config_file_name)
+      if File.exists?(user_config_file)
+        require user_config_file
+      else
+        user_config_file = File.join(Dir.home, ".adocsite_wp")
+        if File.exists?(user_config_file)
+          require user_config_file
+        end
+      end
+    end
 
   end
 end

data/lib/adocsite/version.rb

@@ -1,3 +1,3 @@
 module Adocsite
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adocsite
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &72559830 !ruby/object:Gem::Requirement
+  requirement: &69835100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72559830
+  version_requirements: *69835100
 - !ruby/object:Gem::Dependency
   name: asciidoctor
-  requirement: &72559270 !ruby/object:Gem::Requirement
+  requirement: &69834890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72559270
+  version_requirements: *69834890
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &72558450 !ruby/object:Gem::Requirement
+  requirement: &69834680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72558450
+  version_requirements: *69834680
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &72546610 !ruby/object:Gem::Requirement
+  requirement: &69834470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72546610
+  version_requirements: *69834470
 - !ruby/object:Gem::Dependency
   name: rubypress
-  requirement: &72545890 !ruby/object:Gem::Requirement
+  requirement: &69834260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72545890
+  version_requirements: *69834260
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &72545340 !ruby/object:Gem::Requirement
+  requirement: &69383440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72545340
+  version_requirements: *69383440
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &72544150 !ruby/object:Gem::Requirement
+  requirement: &69382610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72544150
+  version_requirements: *69382610
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &72542310 !ruby/object:Gem::Requirement
+  requirement: &69382060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72542310
+  version_requirements: *69382060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &72515340 !ruby/object:Gem::Requirement
+  requirement: &69381200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '1.5'
   type: :development
   prerelease: false
-  version_requirements: *72515340
+  version_requirements: *69381200
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &72514730 !ruby/object:Gem::Requirement
+  requirement: &69380600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72514730
+  version_requirements: *69380600
 description: Very simple static site generator for asciidoc documents.
 email:
 - bb@myblueraven.com