githelp 0.2.16 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9170af6dd82c78abc8f10dd2bdf76985e9258cb5aa896e62f96b8d7c7634a437
-  data.tar.gz: fb2629186d59ec4c96500dc272e3a665054b0707fb8074a7b2bd9d32b128a087
+  metadata.gz: a3bfb96933272505bb5115d478479ffddc11dfe774e1a5ebe29fd3bb654c5759
+  data.tar.gz: fdc29f2a8653af0c840aa012d11c2498a2b74b14f9b95e5f9a4f436fe08b4dab
 SHA512:
-  metadata.gz: 7be8932bf705098eede633aacf2afe288563be3fdc31b9b4baacdd456d547c39faed0896eeacec4d48179918b9b65bfe1513bec10e4f57eb9381c440be669dd6
-  data.tar.gz: 04fd2caa6229ee66ca86d9840037566c27aea3753afb6e54a2022272c5f1228f5072c940ef0d3af11e95577f3315b6726df0905c5d22800f00ab9e831325b11e
+  metadata.gz: 9ccc19ef69c5fa8b87a1056b0a4e6e55c82d492f633dcc69012051f83d6259382808f8ab3634e2cd237f84be55b8fc6e7ea645f66dd25db3ed85f56940200174
+  data.tar.gz: db455bb525f4c0ea01e3b19cdc6c5ba1f3ec993a6d75a76357ed0b860f4e24daa9d15cb34adeb0bc6dc30d7e822ee9301dcf17fff5f91cab956512102be2b329

data/Gemfile

@@ -1,4 +1,7 @@
+source 'https://rubygems.org'
+
 ruby '2.5.0'
 
 gem 're_expand'
-
+# gem 'scrapbox', :path => '/Users/masui/scrapbox-ruby'
+gem 'scrapbox'

data/exe/githelp

@@ -7,11 +7,8 @@ require 'uri'
 require 'cgi'
 require 'optparse'
 
+require 'scrapbox'
 require 're_expand'
-#require '/Users/masui/expand_ruby/lib/re_expand.rb'
-#require '/Users/masui/expand_ruby/lib/re_expand/Generator'
-#require '/Users/masui/expand_ruby/lib/re_expand/Node'
-#require '/Users/masui/expand_ruby/lib/re_expand/Scanner'
 
 class GitHelp
   def datafile
@@ -20,30 +17,7 @@ class GitHelp
   
   def initialize
     @pagedata = {}
-  end
-
-  def getsbdata(api)
-    uri = URI.parse("https://scrapbox.io/api#{api}")
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = true
-    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    req = Net::HTTP::Get.new(uri.path)
-    res = http.request(req)
-    res.body.force_encoding("utf-8")
-  end
-  
-  # ページタイトルのリストを取得
-  def gettitles
-    data = getsbdata("/pages/GitHelp")
-    JSON.parse(data)['pages'].collect { |page|
-      page['title']
-    }
-  end
-
-  # それぞれのページに対して処理
-  def getpage(title)
-    text = getsbdata("/pages/GitHelp/#{URI.encode(title).gsub(/\//,'%2f')}/text")
-    @pagedata[title] = text.split(/\n/)
+    @project = Scrapbox::Project.new("GitHelp")
   end
 
   def getdata
@@ -51,9 +25,9 @@ class GitHelp
     # ページデータ取得
     #
     puts "-----------------ページデータを取得"
-    gettitles.each { |title|
+    @project.pages.each { |title,page|
       puts "...#{title}"
-      getpage title
+      @pagedata[title] = page.text.split(/\n/)
     }
 
     dumpdata = {}
@@ -67,10 +41,11 @@ class GitHelp
     @pagedata.each { |title,pagedata|
       puts "...#{title}"
       pagedata. each { |line|
-        if line =~ /code:(.*)\.rb$/ then
-          puts "=========== #{$1}.rb"
-          text = getsbdata("/code/GitHelp/#{URI.encode(title)}/#{$1}.rb")
-          dumpdata['codes'] << text
+        if line =~ /code:(.*\.rb)$/ then
+          src = $1
+          puts "=========== #{src}"
+          page = Scrapbox::Page.new(@project,title)
+          dumpdata['codes'] << page.code(src)
         end
       }
     }

data/githelp.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest"
 
   spec.add_runtime_dependency "re_expand"
+  spec.add_runtime_dependency "scrapbox"
 end

data/lib/githelp/version.rb

@@ -1,3 +1,3 @@
 module GitHelp
-  VERSION = "0.2.16"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: githelp
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.3.1
 platform: ruby
 authors:
 - Toshiyuki Masui
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: scrapbox
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: GitHelp - lists git commands from user's vague query strings
 email:
 - masui@pitecan.com