m2m 0.2.0 → 0.2.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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3fe6f9904ec77946ac882d1a5d9f039deb5dd6c6
4
- data.tar.gz: a155f0805fc7ed72cdc7d6ceb9375fe2f091998b
3
+ metadata.gz: 518e0ca031e062e1f7830b8b4372ff4c8f52c28d
4
+ data.tar.gz: bbe68b4f722ee90d9d86dd95b2c758ed3053d44a
5
5
  SHA512:
6
- metadata.gz: 3b0a43fdefd67a318acfcc8d62359af77f0ac7e4288f66eb627cd6607e094e0d4117d03aaff5f1861dca53d753b9842e3e186bc76157ad115e60eb357bf8d80c
7
- data.tar.gz: ba2bd537a3bc26dbe21af62edf27641e57dcc19cce8851f9836f711652c26a85da159b64737e69f5a77a213082b8401c067b2c77cbb570a5aaaa7f25adf84e82
6
+ metadata.gz: 33df9224439096cd40e392257718e12bb764cde1766de37ca1aad348a5a89b4c5b1d025eec1aa644942132d18d4393f9537dcf514d48564dc6068bb210372c3b
7
+ data.tar.gz: c802576ecc28c95516899f59e9375f52e6a53669703083496b497aa54bb5562adae829f5f5fba67418c654f8984ad21583bb4f7d940049e79d9c890c5f6c195d
data/Gemfile CHANGED
@@ -1,5 +1,3 @@
1
- source "https://ruby.taobao.org/"
2
-
3
1
  gem 'nokogiri', '1.6.7'
4
2
  gem 'mustache', '1.0.3'
5
3
  gem 'kramdown', '1.10.0'
@@ -7,5 +5,6 @@ gem 'commander', '4.4.0'
7
5
  gem 'mail', '2.6.4'
8
6
  gem 'webrick', '1.3.1'
9
7
  gem 'aescrypt', '1.0.0'
8
+ gem 'rdoc', '4.2.2'
10
9
 
11
10
  gemspec
@@ -10,6 +10,7 @@ module SiteCommand
10
10
  c.option '-s STRING', '--source STRING', String, 'Markdown源文件的目录'
11
11
  c.option '-t STRING', '--target STRING', String, '生成的目标目录'
12
12
  c.option '--force', String, '强行生成,如果目录存在,则会被删除'
13
+ c.option '--git', String, '提交到git仓库'
13
14
  c.action do |args, options|
14
15
  target = options.target
15
16
  source = options.source
@@ -32,6 +33,11 @@ module SiteCommand
32
33
 
33
34
  #执行生成
34
35
  Generator.new
36
+
37
+ if options.git
38
+ command = "cd #{util.workbench} && git add . && git commit -m 'update by m2m' && git push";
39
+ exec command
40
+ end
35
41
  end
36
42
  end
37
43
  end
@@ -63,7 +63,7 @@ class Compiler
63
63
  #执行生成,
64
64
  #filename: 相对文件路径
65
65
  def execute(type, data, auto_save = true, filename = '')
66
- data['site'] = @setup.get_merged_config['site']
66
+ data['site'] = @setup.site_config
67
67
  data['m2m'] = @util.get_product
68
68
 
69
69
  template = self.read_template type
@@ -23,18 +23,30 @@ class Generator
23
23
  @store = Store.new scan.files
24
24
 
25
25
  @compiler = Compiler.new
26
- @page_size = @setup.get_merged_config['page_size'] || 10
26
+ @page_size = @setup.site_config['page_size'] || 10
27
27
  @page_size = 10 if @page_size.class != Integer
28
28
 
29
29
  self.generate_articles
30
30
  self.copy_theme_resource
31
- #复制文件有问题
31
+
32
+ #复制文件
32
33
  self.copy_workbench_resource
34
+ #生成首页
33
35
  self.generate_home
36
+ #生成索引页
34
37
  self.generate_all_index @store.tree, '', true
38
+
39
+ #如果需要执行命令命令
40
+ self.execute_after_build
35
41
  puts 'Done...'
36
42
  end
37
43
 
44
+ #build后执行的脚本
45
+ def execute_after_build
46
+ command = @setup.site_config['after_build_shell']
47
+ return if not command
48
+ exec command
49
+ end
38
50
  #创建首页
39
51
  def generate_home
40
52
  children = @store.get_children(@store.tree)
@@ -1,5 +1,5 @@
1
1
  module M2M
2
- VERSION = "0.2.0"
2
+ VERSION = "0.2.1"
3
3
  NAME = "m2m"
4
4
  REPOS = "https://github.com/wvv8oo/m2m"
5
5
  HOMEPAGE = "http://m2m.wvv8oo.com/"
@@ -17,14 +17,23 @@ class Setup
17
17
  @target_dir = nil
18
18
  #邮件的配置
19
19
  @mail_config = nil
20
+ #网站的配置
21
+ @site_config = nil
20
22
  end
21
23
 
22
24
  #读取邮件的配置
23
25
  def mail_config
24
- @mail_config = self.get_merged_config['mail'] if not @mail_config
26
+ @mail_config = self.get_merged_config['mail'] || {} if not @mail_config
25
27
  @mail_config
26
28
  end
27
29
 
30
+ #读取网站的配置
31
+ def site_config
32
+ @site_config = self.get_merged_config['site'] || {} if not @mail_config
33
+ @site_config
34
+ end
35
+
36
+
28
37
  #最终的构建目录
29
38
  def target_dir
30
39
  dir = @target_dir
@@ -37,4 +37,5 @@ Gem::Specification.new do |spec|
37
37
  spec.add_runtime_dependency('mail', '2.6.4')
38
38
  spec.add_runtime_dependency('aescrypt', '1.0.0')
39
39
  spec.add_runtime_dependency('webrick', '1.3.1')
40
+ spec.add_runtime_dependency('rdoc', '4.2.2')
40
41
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: m2m
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 0.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - wvv8oo
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2016-06-11 00:00:00.000000000 Z
11
+ date: 2016-06-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -136,6 +136,20 @@ dependencies:
136
136
  - - '='
137
137
  - !ruby/object:Gem::Version
138
138
  version: 1.3.1
139
+ - !ruby/object:Gem::Dependency
140
+ name: rdoc
141
+ requirement: !ruby/object:Gem::Requirement
142
+ requirements:
143
+ - - '='
144
+ - !ruby/object:Gem::Version
145
+ version: 4.2.2
146
+ type: :runtime
147
+ prerelease: false
148
+ version_requirements: !ruby/object:Gem::Requirement
149
+ requirements:
150
+ - - '='
151
+ - !ruby/object:Gem::Version
152
+ version: 4.2.2
139
153
  description: 将Markdown转换为Blog,邮件或者PDF
140
154
  email:
141
155
  - wvv8oo@gmail.com