Charu 0.0.9 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d610ffd3ffeb13cd5b0a660cc7aceb1c9fec0bef
-  data.tar.gz: e722e7d4297c64dd06aa248d9b01ed68abd8c454
+  metadata.gz: 83dcb882bd64f6c482e4c757a4b3d6a29dfead3a
+  data.tar.gz: 421a756feaad4f44969830a55dab0eac3152952a
 SHA512:
-  metadata.gz: c5c7b71bff86efb298a468cc741343db7198f02fc735b7738e49e3cd85dd76f2223de786f58b4097b5c74c661af0bf5662ab1624926e3c2bb81c28b9d21d4a2d
-  data.tar.gz: 5594ebf3bee0bbc6e568f02b56acdd0d0dee61f506a9387866b87e87a11eebe49e6c74b754bbf30827b792ebc814e0f003f9223d3d27591cdf9df18b4585c758
+  metadata.gz: 9ad5d7fcf9d50ae0f73c7d4bc96c68fe91db057ad769208e64f55dde9860201e94cbcc394b2b37dc10c3c03f453c3e6f04b5c8c8a0a34d5c6344c00a940bcf4c
+  data.tar.gz: 2716dad892809399769bfa4be6a55b21db2ed7fb530a63f67689b6f1686855b5c09a16e9157bc0d1519afb911fbdb314a1b99faec375a49069b4e4b9f2d2f47c

data/Execution-Cygwin.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/bash
+ 
+#作成日時:2018-05-31
+
+/bin/ruby.exe bundle exec Charu

data/README.md

@@ -44,6 +44,7 @@ bundle exec Charu
 
 [Change Log メモを試してみよう](http://at-aka.blogspot.jp/p/change-log.html)
 
+パブリックの[Public]:のカテゴリーが付いていないもの以外はHTML化しないです。
 
 ## Development
 

data/lib/Charu.rb

@@ -1,34 +1,43 @@
 # -*- encoding: utf-8 -*-
 
-require "Charu/version"
-require 'bundler'
+if "debug" == ARGV[0] then
+  require 'Charu/Config'
+  require 'Charu/ChangeLogMemo'
+  require 'Charu/CreateHtml'
+  require 'Charu/FTP'
+  require 'Charu/Debug'
 
-Bundler.require
+  debug = Charu::Debug.new()
 
-require 'Charu/ChangeLogMemo'
-require 'Charu/Config'
-require 'Charu/Template'
-require 'Charu/CreateHtml'
-require 'Charu/FTP'
+  #debug.changelogmemo()
+  #debug.createhtml()
+  debug.ftp()
 
-module Charu
-  # Your code goes here...
+else
 
-end
+  require "Charu/version"
+  require 'bundler'
 
-#changelogmemo = Charu::ChangeLogMemo.new()
-#changelogmemo.get_item_sort_reverse(1).each{|key, items|
-  #items.each{|item|
-    #p item.date
-    #p item.get_item_title.encode(Encoding::SJIS)
-    #p i.get_item_category()
-  #}
-#}
-#p changelogmemo.article_size_max()
-#p changelogmemo.article_size_()
-#p changelogmemo.get_category_cnt()
+  Bundler.require
 
+  require 'redcarpet'
 
-createhtml = Charu::PageCounter.new()
-createhtml.create_html()
+  require 'Charu/ChangeLogMemo'
+  require 'Charu/Config'
+  require 'Charu/Template'
+  require 'Charu/CreateHtml'
+  require 'Charu/FTP'
+  #require 'Charu/Sitemap'
 
+  module Charu
+    # Your code goes here...
+
+  end
+
+  page_counter = Charu::PageCounter.new()
+  page_counter.create_html()
+
+  ftp_clariant = Charu::FtpClariant.new()
+  ftp_clariant.put_file()
+
+end

data/lib/Charu/ChangeLogMemo.rb

@@ -1,7 +1,5 @@
 # -*- encoding: utf-8 -*-
 
-require 'redcarpet'
-
 module Charu
   class Category
     attr_accessor :category
@@ -99,6 +97,8 @@ module Charu
         markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML)
         html = markdown.render(@item_log)
 
+		html.gsub!(/(\r\n|\r\f\n|\r|\n)/, "</p>\n<p>")
+		
         return html
       end
       return ""

data/lib/Charu/Config.rb

@@ -8,6 +8,7 @@ module Charu
     attr_accessor :home_title, :top_home_page, :home_category, :home_description, :css_theme_path, :private_category
     attr_accessor :change_log_path, :article_size, :www_html_out_path, :www_html_out_path_private, :public_category
     attr_accessor :ftp_server, :ftp_port, :ftp_user, :ftp_pass
+	attr_accessor :wget_path
     def initialize()
       # ホームページタイトル
       @home_title = "TestPage"
@@ -48,6 +49,9 @@ module Charu
       @ftp_user = ""
       @ftp_pass = ""
 
+	  # Wgetのパス
+	  @wget_path = ""
+	  
     end
   end
 end

data/lib/Charu/CreateHtml.rb

@@ -25,7 +25,7 @@ module Charu
     def create_html()
       p "pages.size " + @pages.size.to_s
       @pages.each{|page|
-        create_html = Charu::CreateHtml.new(page)
+        create_html = Charu::CreateHtml.new(page, @pages.size)
       }
 
     end
@@ -33,10 +33,11 @@ module Charu
   end
 
   class CreateHtml
-    attr_accessor :keyword, :css_theme_path, :link, :hiduke, :day, :title, :config
-    def initialize(page)
+    attr_accessor :keyword, :css_theme_path, :link, :hiduke, :day, :title, :config, :page, :page_max
+    def initialize(page, page_max)
       @config = Charu::Config.new()
 
+      @page_max = page_max
       @page = page
 
       @header   = File.open("./CharuConfig/template/header.erb").read
@@ -122,4 +123,4 @@ module Charu
       }
     end
   end
-end
+end

data/lib/Charu/Debug.rb

@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+
+module Charu
+  class Debug
+    def initialize()
+      print "=====ディバックモード=====\n"
+    end
+
+    def changelogmemo()
+      #changelogmemo = Charu::ChangeLogMemo.new()
+      #changelogmemo.get_item_sort_reverse(1).each{|key, items|
+      #items.each{|item|
+      #p item.date
+      #p item.get_item_title.encode(Encoding::SJIS)
+      #p i.get_item_category()
+      #}
+      #}
+      #p changelogmemo.article_size_max()
+      #p changelogmemo.article_size_()
+      #p changelogmemo.get_category_cnt()
+    end
+
+    def ftp()
+      ftp_clariant = Charu::FtpClariant.new()
+      ftp_clariant.put_file()
+    end
+
+    def createhtml()
+    end
+
+  end
+end

data/lib/Charu/FTP.rb

@@ -7,38 +7,59 @@ module Charu
     def initialize()
       @config = Charu::Config.new()
 
-      @server = @config.server
-      @port = @config.port
-      @user = @config.user
-      @pass = @config.pass
+      @server = @config.ftp_server
+      @port = @config.ftp_port
+      @user = @config.ftp_user
+      @pass = @config.ftp_pass
       @dir = @config.www_html_out_path
 
-      @list = Dir.glob(@dir + '*.html')
+      @list = Dir.glob(@dir + './**/*')
+      @file_list = []
+      @dir_list = []
+
     end
 
     def put_file()
+      # 相対パスから絶対パスへ
+      file_list = []
+      @list.each{|file|
+        file_list << File::expand_path(file) # 絶対パスを取得する
+      }
+
+      # ディレクトリかファイルか判断
+      file_list.each{|file|
+        if FileTest.directory? file
+          # ディレクトリのときの処理
+          @dir_list << file
+
+        elsif FileTest.file? file
+          # ファイルのときの処理
+          @file_list << file
+        else
+          raise print('ファイルでもディレクトリでもない')
+        end
+      }
+      p @dir_list
+      p @file_list
+
       ftp = Net::FTP.new
       ftp.connect(@server, @port)
       ftp.login(@user, @pass)
 
       ftp.chdir('./')
-      p "./  :初期ディレクトリ".encode(Encoding::SJIS)
+      print "./  :初期ディレクトリ\n"
       puts ftp.pwd
 
-      file_list = []
-      @list.each{|file|
-        file_list << File::expand_path(file)
-      }
-      ftp.chdir(@dir)
-      p @dir + ":移動ディレクトリ".encode(Encoding::SJIS)
-      puts ftp.pwd
+      #ftp.chdir(@dir)
+      #print @dir + ":移動ディレクトリ\n"
+      #puts ftp.pwd
 
       # アップロード
-      file_list.each{|file|
+      @file_list.each{|file|
         p file
         ftp.put(file)
       }
-      p "完了".encode(Encoding::SJIS)
+      print "完了\n"
       puts ftp.pwd
 
       ftp.quit

data/lib/Charu/Sitemap.rb

@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+
+
+module Charu
+class FtpClariant
+    def initialize()
+	@config = Charu::Config.new()
+	
+	
+	system("#{@config.wget_path} -r -l 3 -Rjpg,png,css,js,gif  -I /sp -X /sp/user -D #{@config.top_home_page}  -E #{@config.top_home_page}")
+	
+	sleep 20
+	
+	system("find #{@config.top_home_page} -type f > #{@config.top_home_page}.filelist.txt")
+	
+	end
+end
+end

data/lib/Charu/Template.rb

@@ -15,7 +15,21 @@ header = '<!doctype html>
   <title><%= @config.home_title %></title>
 
     <style type="text/css">
-
+       .page{
+              font-size: 20pt;
+             }
+        code{
+              font-size: 15pt;
+              color: white;
+              background-color: black;
+             }
+         a:visited{
+              color: #FF0000;
+             }
+         #page_a:hover{
+              font-size: 20pt;
+              color: black;
+              }
     </style>
 
 </head>
@@ -27,6 +41,16 @@ header = '<!doctype html>
 
 body = ""
 body = '
+<center class="page">
+<a href="./index.html" id="page_a">1</a>
+<% i = 1 %>
+<% while i < @page_max - 1 do %>
+<a href="./index<%= i + 1 %>.html" id="page_a"><%= i + 1 %></a>
+<% i = i + 1 %>
+<% end %>
+<p>ページ</p>
+</center>
+
 <% @changelogmemo.each{|key, items| %>
   <% items.each{|item| %>
     <h2><span class="title">
@@ -36,15 +60,36 @@ body = '
     <p><%= item.get_item_log() %></p>
   <% } %>
 <% } %>
+
+<center class="page">
+<a href="./index.html">1</a>
+<% i = 1 %>
+<% while i < @page_max - 1 do %>
+<a href="./index<%= i + 1 %>.html"><%= i + 1 %></a>
+<% i = i + 1 %>
+<% end %>
+<p>ページ</p>
+</center>
 '
 
 
 day_body = ""
 day_body = '
+
 <a href="./index.html"><h1><%= @title %></h1></a>
 <br>
 <body>
 
+<center class="page">
+<a href="./index.html">1</a>
+<% i = 1 %>
+<% while i < @page_max - 1 do %>
+<a href="./index<%= i + 1 %>.html"><%= i + 1 %></a>
+<% i = i + 1 %>
+<% end %>
+<p>ページ</p>
+</center>
+
 <% @days.each{|day| %>
 <h2><span class="title">
 <% link = "日記" %>
@@ -53,6 +98,16 @@ day_body = '
 <p><%= day[:Log] %></p>
 <% } %>
 
+<center class="page">
+<a href="./index.html">1</a>
+<% i = 1 %>
+<% while i < @page_max - 1 do %>
+<a href="./index<%= i + 1 %>.html"><%= i + 1 %></a>
+<% i = i + 1 %>
+<% end %>
+<p>ページ</p>
+</center>
+
 </body>
 '
 

data/lib/Charu/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 
 module Charu
-  VERSION = "0.0.9"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Charu
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
 platform: ruby
 authors:
 - ShiccaRorl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-08 00:00:00.000000000 Z
+date: 2018-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,6 +82,8 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Charu.gemspec
+- Execution-Cygwin.sh
+- Execution-Windows.cmd
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -93,7 +95,9 @@ files:
 - lib/Charu/ChangeLogMemo.rb
 - lib/Charu/Config.rb
 - lib/Charu/CreateHtml.rb
+- lib/Charu/Debug.rb
 - lib/Charu/FTP.rb
+- lib/Charu/Sitemap.rb
 - lib/Charu/Template.rb
 - lib/Charu/version.rb
 homepage: https://rubygems.org/gems/Charu