m2m 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fe6f9904ec77946ac882d1a5d9f039deb5dd6c6
-  data.tar.gz: a155f0805fc7ed72cdc7d6ceb9375fe2f091998b
+  metadata.gz: 518e0ca031e062e1f7830b8b4372ff4c8f52c28d
+  data.tar.gz: bbe68b4f722ee90d9d86dd95b2c758ed3053d44a
 SHA512:
-  metadata.gz: 3b0a43fdefd67a318acfcc8d62359af77f0ac7e4288f66eb627cd6607e094e0d4117d03aaff5f1861dca53d753b9842e3e186bc76157ad115e60eb357bf8d80c
-  data.tar.gz: ba2bd537a3bc26dbe21af62edf27641e57dcc19cce8851f9836f711652c26a85da159b64737e69f5a77a213082b8401c067b2c77cbb570a5aaaa7f25adf84e82
+  metadata.gz: 33df9224439096cd40e392257718e12bb764cde1766de37ca1aad348a5a89b4c5b1d025eec1aa644942132d18d4393f9537dcf514d48564dc6068bb210372c3b
+  data.tar.gz: c802576ecc28c95516899f59e9375f52e6a53669703083496b497aa54bb5562adae829f5f5fba67418c654f8984ad21583bb4f7d940049e79d9c890c5f6c195d

data/Gemfile

@@ -1,5 +1,3 @@
-source "https://ruby.taobao.org/"
-
 gem 'nokogiri', '1.6.7'
 gem 'mustache', '1.0.3'
 gem 'kramdown', '1.10.0'
@@ -7,5 +5,6 @@ gem 'commander', '4.4.0'
 gem 'mail', '2.6.4'
 gem 'webrick', '1.3.1'
 gem 'aescrypt', '1.0.0'
+gem 'rdoc', '4.2.2'
 
 gemspec

data/exe/site.rb

@@ -10,6 +10,7 @@ module SiteCommand
 		c.option '-s STRING', '--source STRING', String, 'Markdown源文件的目录'
 		c.option '-t STRING', '--target STRING', String, '生成的目标目录'
 		c.option '--force', String, '强行生成，如果目录存在，则会被删除'
+		c.option '--git', String, '提交到git仓库'
 		c.action do |args, options|
 			target = options.target
 			source = options.source
@@ -32,6 +33,11 @@ module SiteCommand
 
 			#执行生成
 			Generator.new
+
+			if options.git
+				command = "cd #{util.workbench} && git add . && git commit -m 'update by m2m' && git push";
+				exec command
+			end
 		end
 	end
 end

data/lib/compiler.rb

@@ -63,7 +63,7 @@ class Compiler
     #执行生成,
     #filename: 相对文件路径
     def execute(type, data, auto_save = true, filename = '')
-        data['site'] = @setup.get_merged_config['site']
+        data['site'] = @setup.site_config
         data['m2m'] = @util.get_product
 
         template = self.read_template type

data/lib/generator.rb

@@ -23,18 +23,30 @@ class Generator
         @store = Store.new scan.files
 
         @compiler = Compiler.new
-        @page_size = @setup.get_merged_config['page_size'] || 10
+        @page_size = @setup.site_config['page_size'] || 10
         @page_size = 10 if @page_size.class != Integer
 
         self.generate_articles
         self.copy_theme_resource
-        #复制文件有问题
+
+        #复制文件
         self.copy_workbench_resource
+        #生成首页
         self.generate_home
+        #生成索引页
         self.generate_all_index @store.tree, '', true
+
+        #如果需要执行命令命令
+        self.execute_after_build
         puts 'Done...'
     end
 
+    #build后执行的脚本
+    def execute_after_build
+        command = @setup.site_config['after_build_shell']
+        return if not command
+        exec command
+    end
     #创建首页
     def generate_home
         children = @store.get_children(@store.tree)

data/lib/product.rb

@@ -1,5 +1,5 @@
 module M2M
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
   NAME = "m2m"
   REPOS = "https://github.com/wvv8oo/m2m"
   HOMEPAGE = "http://m2m.wvv8oo.com/"

data/lib/setup.rb

@@ -17,14 +17,23 @@ class Setup
         @target_dir = nil
         #邮件的配置
         @mail_config = nil
+        #网站的配置
+        @site_config = nil
 	end
 
 	#读取邮件的配置
 	def mail_config
-		@mail_config = self.get_merged_config['mail'] if not @mail_config
+		@mail_config = self.get_merged_config['mail'] || {} if not @mail_config
 		@mail_config
 	end
 
+	#读取网站的配置
+	def site_config
+		@site_config = self.get_merged_config['site'] || {} if not @mail_config
+		@site_config
+	end
+
+
 	#最终的构建目录
     def target_dir
         dir = @target_dir

data/m2m.gemspec

@@ -37,4 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency('mail', '2.6.4')
   spec.add_runtime_dependency('aescrypt', '1.0.0')
   spec.add_runtime_dependency('webrick', '1.3.1')
+  spec.add_runtime_dependency('rdoc', '4.2.2')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: m2m
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - wvv8oo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-11 00:00:00.000000000 Z
+date: 2016-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.2.2
 description: 将Markdown转换为Blog，邮件或者PDF
 email:
 - wvv8oo@gmail.com