adocsite 1.0.0 → 1.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/bin/adocsite CHANGED
@@ -6,8 +6,7 @@ require 'commander/import'
6
6
  require 'bundler/setup'
7
7
  require 'adocsite'
8
8
 
9
-
10
- program :version, '1.0.0'
9
+ program :version, Adocsite::VERSION
11
10
  program :description, 'Very simple static site generator for asciidoc documents'
12
11
 
13
12
  default_command :build
@@ -1,11 +1,7 @@
1
1
  module Adocsite
2
2
  class Commands
3
3
  def Commands.build(args, options)
4
- user_config_file_name = options.config || "adocsite_config.rb"
5
- user_config_file = File.join(Dir.pwd, user_config_file_name)
6
- if File.exists?(user_config_file)
7
- require user_config_file
8
- end
4
+ Commands.load_config(args, options)
9
5
 
10
6
  engine = Adocsite::Engine.new
11
7
  engine.build(options.layout)
@@ -34,11 +30,7 @@ EOS
34
30
  end
35
31
 
36
32
  def Commands.post(args, options)
37
- user_config_file_name = options.config || "adocsite_wp_config.rb"
38
- user_config_file = File.join(Dir.pwd, user_config_file_name)
39
- if File.exists?(user_config_file)
40
- require user_config_file
41
- end
33
+ Commands.load_config_wp(args, options)
42
34
 
43
35
  wp = Adocsite::WpPost.new
44
36
 
@@ -60,11 +52,7 @@ EOS
60
52
  end
61
53
 
62
54
  def Commands.list(args, options)
63
- user_config_file_name = options.config || "adocsite_config.rb"
64
- user_config_file = File.join(Dir.pwd, user_config_file_name)
65
- if File.exists?(user_config_file)
66
- require user_config_file
67
- end
55
+ Commands.load_config(args, options)
68
56
 
69
57
  alist = Hash.new
70
58
  engine = Adocsite::Engine.new
@@ -78,6 +66,32 @@ EOS
78
66
 
79
67
  puts 'Done.'
80
68
  end
69
+
70
+ def Commands.load_config(args, options)
71
+ user_config_file_name = options.config || "adocsite_config.rb"
72
+ user_config_file = File.join(Dir.pwd, user_config_file_name)
73
+ if File.exists?(user_config_file)
74
+ require user_config_file
75
+ else
76
+ user_config_file = File.join(Dir.home, ".adocsite")
77
+ if File.exists?(user_config_file)
78
+ require user_config_file
79
+ end
80
+ end
81
+ end
82
+
83
+ def Commands.load_config_wp(args, options)
84
+ user_config_file_name = options.config || "adocsite_wp_config.rb"
85
+ user_config_file = File.join(Dir.pwd, user_config_file_name)
86
+ if File.exists?(user_config_file)
87
+ require user_config_file
88
+ else
89
+ user_config_file = File.join(Dir.home, ".adocsite_wp")
90
+ if File.exists?(user_config_file)
91
+ require user_config_file
92
+ end
93
+ end
94
+ end
81
95
 
82
96
  end
83
97
  end
@@ -1,3 +1,3 @@
1
1
  module Adocsite
2
- VERSION = "1.0.0"
2
+ VERSION = "1.0.1"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: adocsite
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.0.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-04-14 00:00:00.000000000 Z
12
+ date: 2014-04-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: haml
16
- requirement: &72559830 !ruby/object:Gem::Requirement
16
+ requirement: &69835100 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *72559830
24
+ version_requirements: *69835100
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: asciidoctor
27
- requirement: &72559270 !ruby/object:Gem::Requirement
27
+ requirement: &69834890 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *72559270
35
+ version_requirements: *69834890
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: tilt
38
- requirement: &72558450 !ruby/object:Gem::Requirement
38
+ requirement: &69834680 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *72558450
46
+ version_requirements: *69834680
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: commander
49
- requirement: &72546610 !ruby/object:Gem::Requirement
49
+ requirement: &69834470 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *72546610
57
+ version_requirements: *69834470
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rubypress
60
- requirement: &72545890 !ruby/object:Gem::Requirement
60
+ requirement: &69834260 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *72545890
68
+ version_requirements: *69834260
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: nokogiri
71
- requirement: &72545340 !ruby/object:Gem::Requirement
71
+ requirement: &69383440 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *72545340
79
+ version_requirements: *69383440
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: terminal-table
82
- requirement: &72544150 !ruby/object:Gem::Requirement
82
+ requirement: &69382610 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *72544150
90
+ version_requirements: *69382610
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: mime-types
93
- requirement: &72542310 !ruby/object:Gem::Requirement
93
+ requirement: &69382060 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *72542310
101
+ version_requirements: *69382060
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: bundler
104
- requirement: &72515340 !ruby/object:Gem::Requirement
104
+ requirement: &69381200 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ~>
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '1.5'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *72515340
112
+ version_requirements: *69381200
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: rake
115
- requirement: &72514730 !ruby/object:Gem::Requirement
115
+ requirement: &69380600 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
120
120
  version: '0'
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *72514730
123
+ version_requirements: *69380600
124
124
  description: Very simple static site generator for asciidoc documents.
125
125
  email:
126
126
  - bb@myblueraven.com