helpline 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b2bc48034db45fc57d3f69b5d992dc7ab045e7acf82d48fe0f225398ee6fdb9
-  data.tar.gz: f2f1cfcfb59fd2c7cbafd8ac650cf569caac793d3ebf3821b8032a9529370acf
+  metadata.gz: 4da846a2097e73873989f053ae7acba666b64e9fb350ac543897ee2e10889311
+  data.tar.gz: 4237c2757bdec52c46225849dd08169b5aed63a4031c5ece0e5ee4175548f8d7
 SHA512:
-  metadata.gz: 3c646c3edc7b3c5ca9120db0802e446ffdae29e76e475d228feb23fcc5a43568a7f237be646f2f8e1ff1399d6b43dbe69e0d186324d4c3ad6456528cfda4a19a
-  data.tar.gz: 791d893b90bc215c7ee063db030d17f7b0549af829683d59d59a7af54e3a4bc4650462a1854f261681e39211d17695af2b3f940039ce19682f035a8dfb13ef5f
+  metadata.gz: 02b39b745ecd0c4088981a533283e2d4d5547b31ecd8d73e74146765d9cd7441460e2690c8d3e8c85ffe7425db30ce4535d7317e44c9283baf3182b39e947f01
+  data.tar.gz: 3c0c888681502eb0ce5e548a02fb53c95fba00cba92dce8d62420fe17e1bce618f13e59101068714ab7b9370352e1286941bc65e288d1e94c941ed5e4bcac823

data/Makefile

@@ -1,54 +1,15 @@
-.PHONY: data.js glossary.js test
-
-run: browserify
-	npm start .
-
-browserify:
-	browserify helpline.js -o helpline_browserify.js
-
-build-mac: install browserify
-	npm run build
-	cp -r build/mac/HelpLine.app /Applications
-upload:
-	scp build/HelpLine-0.0.1.dmg pitecan.com:/www/www.pitecan.com/tmp/HelpLine.dmg
-
-build-chromebook: browserify install
-	npm run build
-
-#dmg: build-mac
-#	-/bin/rm -f HelpLine.dmg
-#	hdiutil create -srcfolder build/mac/HelpLine.app -volname HelpLine HelpLine.dmg
-
-#install: npm browserify cursorpos electron
-install:
-	npm install
-
-electron:
-	npm install electron
-
 #
-# Scrapboxからデータ更新
-#
-update: data.js glossary.js
-data.js:
-	ruby getdata.rb > data.js
-glossary.js:
-	ruby getglossary.rb > glossary.js
-
-clean:
-	-/bin/rm -r -f node_modules
-	-/bin/rm -r -f build
-	-/bin/rm -f HelpLine.dmg
-
-all: update build-mac
-
-
-#
-# gem
+# Gem版
 #
 release:
 	rake release
 
+update:
+	helpline --update
+
+update-local:
+	helpline --update --debug --source ~/ScrapboxData/HelpLine.json,~/ScrapboxData/masui-helpline.json
+
 #
 # テスト
 #

data/Makefile.electron

@@ -0,0 +1,43 @@
+.PHONY: data.js glossary.js test
+
+run: browserify
+	npm start .
+
+browserify:
+	browserify helpline.js -o helpline_browserify.js
+
+build-mac: install browserify
+	npm run build
+	cp -r build/mac/HelpLine.app /Applications
+upload:
+	scp build/HelpLine-0.0.1.dmg pitecan.com:/www/www.pitecan.com/tmp/HelpLine.dmg
+
+build-chromebook: browserify install
+	npm run build
+
+#dmg: build-mac
+#	-/bin/rm -f HelpLine.dmg
+#	hdiutil create -srcfolder build/mac/HelpLine.app -volname HelpLine HelpLine.dmg
+
+#install: npm browserify cursorpos electron
+install:
+	npm install
+
+electron:
+	npm install electron
+
+#
+# Scrapboxからデータ更新
+#
+update: data.js glossary.js
+data.js:
+	ruby getdata.rb > data.js
+glossary.js:
+	ruby getglossary.rb > glossary.js
+
+clean:
+	-/bin/rm -r -f node_modules
+	-/bin/rm -r -f build
+	-/bin/rm -f HelpLine.dmg
+
+all: update build-mac

data/exe/helpline

@@ -57,21 +57,21 @@ class HelpLine
       #
       puts "-----------------関数/定数を取得"
       src = nil
-      indent = ''
       code = []
       pagedata.each { |title,lines|
         puts "...#{title}"
         lines.each { |line|
-          if src && line =~ /^#{indent}\s+/ then
+          if src && line =~ /^\s+/ then
             code << line
           elsif line =~ /^code:(.*\.rb)$/ then
-            src = $2
-            indent = $1
+            if code.length > 0
+              dumpdata['codes'] << code.join("\n")
+            end
+            src = $1
             code = []
           elsif src then
             dumpdata['codes'] << code.join("\n")
             src = nil
-            indent = ''
             code = []
           else
           end
@@ -89,18 +89,18 @@ class HelpLine
         pagedata.each { |line|
           if !codeindent
             if line =~ /^code:/
-              codeindent = $1.length
+              codeindent = 0
               next
             end
           else
             line =~ /^(\s*)/
-            if line.length < codeindent
+            if $1.length < codeindent + 1
               codeindent = nil
             else
               next
             end
           end
-          if line =~ /^\s*[\$\%\?]/
+          if line =~ /^[\$\%\?]/
             if line =~ /^\%/ && !processing_defs
               puts "'$'で始まる用例定義なしでコマンドを定義しようとしています"
               exit
@@ -161,9 +161,9 @@ class HelpLine
     File.open(logfile,"w"){ |f|  # ログを残す場合
       entries = []
       data['defs'].each { |line|
-        if line =~ /^\s*[\$\?]\s*(.*)$/ # $....
+        if line =~ /^[\$\?]\s*(.*)$/ # $....
           entries << $1
-        elsif line =~ /^\s*\%\s*(.*)$/ # %....
+        elsif line =~ /^\%\s*(.*)$/ # %....
           cmd = $1
           entries.each { |l|
             desc = eval('"' + l + '"')

data/lib/helpline/version.rb

@@ -1,3 +1,3 @@
 module Helpline
-  VERSION = "0.1.17"
+  VERSION = "0.1.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: helpline
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Toshiyuki Masui
@@ -94,6 +94,7 @@ files:
 - HelpLine.json
 - LICENSE.txt
 - Makefile
+- Makefile.electron
 - README.md
 - Rakefile
 - _config.yml