my_help 0.8.3 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: af669506ead4e56be3bda410c300db976b75a46e
-  data.tar.gz: b86b7072d951a084e07a02c7141da126f24b159c
+SHA256:
+  metadata.gz: 256d8c9ec84045cb103f0de05567c4107d7b97c48b26bbd3697df3db009e5dbc
+  data.tar.gz: 5be179861617eff7530d061669d36d61e4f9de3bea0bb4f32c6ff2117bb5a28d
 SHA512:
-  metadata.gz: 779aadb940d47bf053048a26adf8feda5b16a72bff50171d975b2fbd8334ce62c2344957f562d11e2ea40439c712d87b08a827533a4b57728c7ed75a27c35dc8
-  data.tar.gz: ec6311de9c0778e09c54df1dcf7058126ad579f654222360f64437ae11b92f51c13dd8543e62c79025c5358e2656699c676eb8942b442a42743cbd36bb526abd
+  metadata.gz: a5b5077ff038c414ffc5c6d13c8691d18d9706282931f406a5c36f6f61807699fa418628a0faa0a9dea422f6d17b7b3d53034edb9f71d349af5c88265d09bd04
+  data.tar.gz: 4050c4dda2c5e5f4e6ad0b43368a69963b5ef8e82eb8b522c119cdea2287f76efbd15f077ae86ff3a2e5b7b63e18685899e97be6632728844d885e1af520fa90

data/.rspec

@@ -1 +1,4 @@
 --require spec_helper
+--format documentation
+--color
+

data/Gemfile

@@ -1,3 +1,6 @@
 source 'https://rubygems.org'
 gemspec
-gem 'ffi', '>= 1.9.24'
+gem 'ffi', '~> 1.9'
+gem 'aruba', '~> 0.14.12'
+gem 'command_line', '~> 1.1.0'
+gem 'color_echo'

data/Gemfile.lock

@@ -1,19 +1,50 @@
 PATH
   remote: .
   specs:
-    my_help (0.8.0)
+    my_help (0.8.4)
       colorize
-      gli (= 2.17.1)
+      command_line
+      thor
 
 GEM
   remote: https://rubygems.org/
   specs:
+    aruba (0.14.12)
+      childprocess (>= 0.6.3, < 4.0.0)
+      contracts (~> 0.9)
+      cucumber (>= 1.3.19)
+      ffi (~> 1.9)
+      rspec-expectations (>= 2.99)
+      thor (~> 0.19)
+    backports (3.15.0)
+    builder (3.2.3)
+    childprocess (3.0.0)
+    color_echo (3.1.1)
     colorize (0.8.1)
+    command_line (1.1.0)
+    contracts (0.16.0)
+    cucumber (3.1.2)
+      builder (>= 2.1.2)
+      cucumber-core (~> 3.2.0)
+      cucumber-expressions (~> 6.0.1)
+      cucumber-wire (~> 0.0.1)
+      diff-lcs (~> 1.3)
+      gherkin (~> 5.1.0)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
+    cucumber-core (3.2.1)
+      backports (>= 3.8.0)
+      cucumber-tag_expressions (~> 1.1.0)
+      gherkin (~> 5.0)
+    cucumber-expressions (6.0.1)
+    cucumber-tag_expressions (1.1.1)
+    cucumber-wire (0.0.1)
     diff-lcs (1.3)
-    ffi (1.11.2)
-    gli (2.17.1)
+    ffi (1.11.3)
+    gherkin (5.1.0)
+    multi_json (1.14.1)
+    multi_test (0.1.2)
     rake (13.0.1)
-    rdoc (6.2.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -33,12 +64,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  ffi (>= 1.9.24)
+  aruba (~> 0.14.12)
+  color_echo
+  command_line (~> 1.1.0)
+  ffi (~> 1.9)
   my_help!
   rake
-  rdoc
   rspec
-  thor
 
 BUNDLED WITH
    2.0.2

data/bin/my_help_thor

@@ -0,0 +1,66 @@
+#!/usr/bin/env ruby
+require 'thor'
+require 'my_help'
+require 'colorize'
+class MyCLI < Thor
+  desc('setup', 'set up the test database')
+  def setup(*args)
+    $control = MyHelp::Control.new()
+  end
+
+  desc "list", "list all helps, specific HELP, or item"
+  def list(*args)
+    invoke :setup
+    file = args[0]
+    item = args[1]
+    if file.nil?
+      puts $control.list_all # list []
+    elsif item.nil?
+      begin
+        puts $control.list_help(file) # list [file]
+      rescue => e
+        puts e.to_s.red
+      end
+    else
+      begin
+        puts $control.show_item(file, item) # list [file] [item]
+      rescue => e
+        puts e.to_s.red
+      end
+    end
+  end
+
+  desc "edit {help_name}", "edit HELP_NAME"
+  def edit(help_name)
+    invoke :setup
+    $control.edit_help(help_name)
+  end
+
+  desc "new {help_name}", "make new HELP_NAME"
+  def new(help_name)
+    invoke :setup
+    $control.init_help(help_name)
+  end
+
+  desc "delete {help_name}", "delete HELP_NAME"
+  def delete(help_name)
+    invoke :setup
+    $control.delete_help(help_name)
+  end
+
+  desc "tomo_upload {help_name}", "tomo_upload HELP_NAME"
+  def tomo_upload(help_name)
+    invoke :setup
+    $control.upload_help(help_name)
+  end
+
+  desc "search {find_char}", "search FIND_CHAR"
+  def search(find_char)
+    invoke :setup
+    $control.search_help(find_char)
+  end
+end
+
+MyCLI.start(ARGV)
+
+

data/exe/my_help

@@ -2,6 +2,8 @@
 require 'thor'
 require 'my_help'
 require 'colorize'
+require 'command_line/global'
+
 class MyCLI < Thor
   desc('setup', 'set up the test database')
   def setup(*args)
@@ -59,6 +61,29 @@ class MyCLI < Thor
     invoke :setup
     $control.delete_help(help_name)
   end
+  desc "git [push|pull]", "git push or pull"
+  def git(push_or_pull)
+    p push_or_pull
+    invoke :setup
+    dir = $control.local_help_dir
+    Dir.chdir(dir) do
+      case push_or_pull
+      when 'push'
+        comms = ['git add -A',
+                 "git commit -m 'git push from my_help'",
+                 "git push origin master"]
+      when 'pull'
+        comms = ['git pull origin master']
+      else
+        raise "my_help git was called by the other than 'push or pull'"
+      end
+      comms.each do |comm|
+        c = command_line(comm)
+        puts c.stdout.blue
+        puts c.stderr.red
+      end
+    end
+  end
 
 #  desc "search {find_char}", "search FIND_CHAR"
 #  def search(find_char)

data/lib/my_help/my_help_controll.rb

@@ -12,7 +12,7 @@ module MyHelp
       @template_dir = File.expand_path("../../templates", __FILE__)
       @exe_dir = File.expand_path("../../exe", __FILE__)
       @local_help_dir = File.join(ENV['HOME'],'.my_help')
-      @editor = 'code' #'emacs' #'vim'
+      @editor = 'code' #'emacs' #'vim' #default editor
       # @mini_account = File
       set_help_dir_if_not_exists
       load_conf
@@ -21,10 +21,10 @@ module MyHelp
     def set_editor(editor)
       @editor = editor
       file_name = '.my_help_conf.yml'
-      # @conf_file = File.join(Dir.pwd, file_name)
       @conf_file = File.join(@local_help_dir, file_name)
       conf = {editor: editor}
       File.open(@conf_file, 'w'){|f| YAML.dump(conf, f)}
+      puts "set editor '#{@editor}'"
     end
 
     def load_conf
@@ -35,8 +35,9 @@ module MyHelp
         conf = YAML.load_file(@conf_file)
         @editor = conf[:editor]
       rescue => e
-        p e
-        set_editor('code')
+        puts e.to_s.red
+        puts 'make .my_help_conf.yml'.green
+        set_editor(@editor)
       end
     end
 
@@ -125,6 +126,7 @@ module MyHelp
       FileUtils::Verbose.cp(template,target_help)
     end
 
+=begin
     def delete_help(file)
       file = File.join(@local_help_dir,file+'.org')
       print "Are you sure to delete "+file.blue+"?[Ynq] ".red
@@ -132,10 +134,27 @@ module MyHelp
       when 'Y'
         begin
           FileUtils.rm(file,:verbose=>true)
+         rescue => error
+          puts error.to_s.red
+         end
+      when 'n', 'q' ; exit
+      end
+    end
+=end
+
+    def delete_help(file)
+      file = File.join(@local_help_dir,file+'.org')
+      print "Are you sure to delete "+file.blue+"?[Yn] ".red
+      case STDIN.gets.chomp
+      when 'Y'
+        begin
+          FileUtils.rm(file,:verbose=>true)
+          return 0
         rescue => error
           puts error.to_s.red
+          return 1
         end
-      when 'n', 'q' ; exit
+      when 'n', 'q' ; return 0
       end
     end
 

data/lib/my_help/version.rb

@@ -1,3 +1,3 @@
 module MyHelp
-  VERSION = "0.8.3"
+  VERSION = "0.8.5"
 end

data/my_help.gemspec

@@ -17,9 +17,10 @@ spec = Gem::Specification.new do |s|
   s.bindir        = "exe"
   s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.add_development_dependency('rake')
-  s.add_development_dependency('rdoc')
+#  s.add_development_dependency('rdoc')
   s.add_development_dependency('rspec')
   s.add_runtime_dependency('thor')
 #  s.add_runtime_dependency('gli','2.17.1')
   s.add_runtime_dependency "colorize"
+  s.add_runtime_dependency "command_line"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_help
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.5
 platform: ruby
 authors:
 - Shigeot R. Nishitani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-11 00:00:00.000000000 Z
+date: 2020-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,13 +39,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: command_line
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -105,6 +105,7 @@ files:
 - README.rdoc
 - README_en.org
 - Rakefile
+- bin/my_help_thor
 - doc/MyHelp.html
 - doc/MyHelp/Control.html
 - doc/OrgToYaml.html
@@ -153,8 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: user building help