m2m 0.2.3 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69a24996646f9645047c44bc9b5d41f0f2f12c40
-  data.tar.gz: d2388c806f291018378489f50cedd44603292d4b
+  metadata.gz: 0f65d9e01f4b4e4f27d439dc9a6fb6a91e686294
+  data.tar.gz: 57c9b168be1279c46f76e6c8499eae7c09cfac9c
 SHA512:
-  metadata.gz: 33a76f74dfacc08b9ff0ca24dd71d5d29e14d7d6f9014dec4bcf8546f8fef4fbf46da5246046649183a2b8eb2ac284fa91249102858f42216c7942efda56fc8e
-  data.tar.gz: 89dc20aab0c1092b710b6ea314b581a9ec66c66b7569aa2b9e2fa6262f9b8998666a5360a08b2d654a4cdf85c4aa558b6ad6ef36925b8f1f6e000f795b26b631
+  metadata.gz: 34362e8196765e446f563e9d0006f675b7efdab8567af7719f58e35ff067ce28d52e6b3221ca72b1bf100960045b6089926a9e7569a61d3ddf104fb80d6ba236
+  data.tar.gz: d500be9c8c50dc9cd9970cf114bf1ab0dba7741ab6680a4ffd104bc14a1fdddae832aad6bab7f9dfeb4757c5e0474689253fbc2028f85b86571527a2e6503a7c

data/Gemfile

@@ -1,6 +1,6 @@
 gem 'nokogiri', '1.6.7'
 gem 'mustache', '1.0.3'
-gem 'kramdown', '1.10.0'
+gem 'kramdown', '1.11.1'
 gem 'commander', '4.4.0'
 gem 'mail', '2.6.4'
 gem 'webrick', '1.3.1'

data/Gemfile.lock

@@ -15,7 +15,7 @@ PLATFORMS
 
 DEPENDENCIES
   commander (= 4.4.0)
-  kramdown (= 1.10.0)
+  kramdown (= 1.11.1)
   mustache (= 1.0.3)
   nokogiri (= 1.6.7)
 

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
 
 require "bundler/setup"
 require "m2m"

data/bin/setup

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+# -*- coding: utf-8 -*-
+
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/exe/m2m

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
 
 require 'rubygems'
 require 'commander'

data/exe/mailer.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require 'commander'
 require_relative '../lib/mailer'
 

data/exe/server.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require 'commander'
 require_relative '../lib/generator'
 require_relative '../lib/setup'

data/exe/setup.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require 'commander'
 require_relative '../lib/setup'
 require_relative '../lib/util'

data/exe/site.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require 'commander'
 require_relative '../lib/generator'
 require_relative '../lib/setup'

data/lib/article.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 #读取文件内容
 require 'nokogiri'
 require 'kramdown'
@@ -30,7 +32,7 @@ class Article
         result['mtime'] = File::ctime file
 
         #读取原始内容
-        original = IO.read(file)
+        original = @util.read_file file
         result['original'] = original
 
         #相对路径

data/lib/compiler.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 #使用模板转换为HTML
 
 require 'mustache'
@@ -15,6 +17,7 @@ class Compiler
         #当前的工作目录
         @workbench = @util.workbench
         @theme_dir = self.get_theme_dir
+
         @template_dir = File::join(@theme_dir, 'template')
         Mustache.template_path = File::join(@template_dir, 'partials')
 
@@ -34,30 +37,27 @@ class Compiler
         dir
     end
 
+
     #根据配置获取theme, 如果没有, 则使用默认的theme
     def get_theme_dir()
-        #先从当前工作目录下查找theme目录
-        dir = File::join(@workbench, @util.local_theme_dir)
-        #当前有theme目录
-        return dir if(File::exists?(dir))
-
-        base_dir = File::join(Pathname.new(File.dirname(__FILE__)), 'themes')
+        #获取用户配置的theme
+        theme_dir = @setup.get_theme
+        #如果这个目录存在，则使用用户设置的主题
+        return theme_dir if theme_dir and File::exists?(theme_dir)
 
-        
-        #根据用户配置获取theme
-        theme_name = @setup.get_merged_config['theme'] || 'hyde'
-        theme_dir = File::join(base_dir, theme_name)
+        #没有找到配置，则考虑默认的theme目录
+        theme_dir = File::join(@workbench, @util.local_theme_dir)
+        return theme_dir if(File::exists?(theme_dir))
 
-        #如果没有找到对应的theme, 则
-        return theme_dir if(File.exists?(theme_dir))
-        File::join(base_dir, 'hyde')
+        #还是没有找到，则使用系统自带主题
+        File::join(@util.themes_dir, 'hyde')
     end
 
 
     #读取模板
     def read_template(name)
         file = File::join(@template_dir, name + '.mustache')
-        IO.read(file)
+        @util.read_file file
     end
 
     #执行生成,

data/lib/generator.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 #生成全站
 require 'fileutils'
 
@@ -138,6 +140,7 @@ class Generator
 
     #编译模板
     def compiler(filename, template_name, data)
+        data['tree'] = @store.tree
         data['product'] = @util.get_product 
         data['root/relative_path'] = @util.get_relative_dot(filename)
 

data/lib/mailer.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 #将markdown发送为邮件
 require 'mail'
 require_relative './scan'

data/lib/meta.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 #分析meta值
 # http://pythonhosted.org/Markdown/extensions/meta_data.html
 

data/lib/product.rb

@@ -1,5 +1,7 @@
+# -*- coding: utf-8 -*-
+
 module M2M
-  VERSION = "0.2.3"
+  VERSION = "0.2.7"
   NAME = "m2m"
   REPOS = "https://github.com/wvv8oo/m2m"
   HOMEPAGE = "http://m2m.wvv8oo.com/"

data/lib/scan.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 
 require 'pathname'
 require_relative './util'

data/lib/server.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require 'webrick'
 require_relative './util'
 require_relative './setup'

data/lib/setup.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require 'yaml' 
 require 'singleton'
 require_relative './util'
@@ -71,13 +73,28 @@ class Setup
 		File::join root, @util.config_file
 	end
 
+	#获取用户的theme, 如果没有找到，返回null
+	def get_theme
+		#根据用户配置获取theme
+        theme_name = self.get_merged_config['theme']
+        #用户没有配置自己的theme
+        return if not theme_name
+
+        #如果是相对路径， 则认为用户是配置在当前的目录下
+        if theme_name.index('./') === 0
+        	return File::join(@util.workbench, theme_name)
+        else
+        	return File::join(@util.themes_dir, theme_name)
+        end
+	end
+
 	#读取配置文件
 	def read(is_global)
 		file = self.get_config_file is_global
 		return {} if not File::exists? file
 
 		#读取配置文件 
-        YAML.load IO.read(file)
+        YAML.load @util.read_file(file)
 	end
 
 	#写入配置文件

data/lib/store.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 #缓存数据, 并建立索引
 
 require_relative './article'
@@ -13,6 +15,10 @@ class Store
         @article = Article.new
 
         @data = {
+            #首页
+            'home' => nil,
+            #完整的分类
+            'categories' => Array.new,
             #所有文章列表
             'articles' => self.get_articles(files),
             #目录树
@@ -22,9 +28,16 @@ class Store
         }
 
         self.make_tree_index
+        self.make_categories
         self.sort @data['tree']
     end
 
+    #获取所有的分类
+    def categories
+        @data['categories']
+    end
+
+    #获取
     def tree
         @data['tree']
     end
@@ -56,6 +69,11 @@ class Store
         result
     end
 
+    #生成分类的列表
+    def make_categories
+
+    end
+
     #创建树状结构的索引
     def make_tree_index
         this = self

data/lib/toc.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 #读取文件内容
 
 require 'kramdown'

data/lib/util.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require 'yaml' 
 require 'fileutils'
 require 'singleton'
@@ -46,6 +48,10 @@ class Util
         @project_name = File::basename dir
     end
 
+    #获取m2m自带theme的目录
+    def themes_dir
+        File::join(Pathname.new(File.dirname(__FILE__)), 'themes')
+    end
     ####################  获取 ####################
     #临时目录
     def get_temp_dir
@@ -84,9 +90,15 @@ class Util
         # puts dir
         FileUtils.mkpath(dir) if not File::exists?(dir)
         #写入文件
-        IO.write(file, content)
+        IO.write(file, content, :encoding => 'utf-8')
+    end
+
+    #读取文件
+    def read_file(file)
+        IO.read file, :encoding => 'utf-8'
     end
 
+    #错误
     def error(log, level = 1)
         puts log
         exit level

data/m2m.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency('commander', '4.4.0')
   spec.add_runtime_dependency('nokogiri', '1.6.7')
   spec.add_runtime_dependency('mustache', '1.0.3')
-  spec.add_runtime_dependency('kramdown', '1.10.0')
+  spec.add_runtime_dependency('kramdown', '1.11.1')
   spec.add_runtime_dependency('mail', '2.6.4')
   spec.add_runtime_dependency('aescrypt', '1.0.0')
   spec.add_runtime_dependency('webrick', '1.3.1')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: m2m
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.7
 platform: ruby
 authors:
 - wvv8oo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.1
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,7 @@ files:
 - LICENSE
 - README.md
 - bin/console
+- bin/setup
 - exe/m2m
 - exe/mailer.rb
 - exe/server.rb