qiita_org 0.1.33 → 0.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c62db4cbaa124181ee7ac6a7051ee752f5ba1a11ea4bdc3b949880b859de183b
-  data.tar.gz: 0400a11c712f89e91977560e659505306e8b366a25ff57fc0f06f1a3b4db6dad
+  metadata.gz: aeb87f387d30d9841544ed8ffc39ed661551eb18e2b08349784bcec52f4536b7
+  data.tar.gz: cae658785a60089b2c831ff19ae50fff9fcfb10763f135016f5bf1449330543c
 SHA512:
-  metadata.gz: dae78c2320afc2a1a0efe7ec593a3c074a3dfc256460388105ff969b69ea0a213c418d025e55bf2556a7b0927691234fd485eaed3d839d5c93a1e477a969090e
-  data.tar.gz: 8b4517c1aebd8150c00b956703958d4fb2a72fb00b7307b7aceefc19c188bed90e3b187d06f9b0f04c439e2bfda785bcb5a31ce221d78a5546d60dd9175f6551
+  metadata.gz: 852b7ce6c726f8912c1767872d590f4b1397ff2474603daae95c4405b4f3e89ed4b4660cd214b4970c02332e53be5b7498debd7f4ff221d9f340a0a9ff82471b
+  data.tar.gz: 17bc4ff9137207256e5c903cace754290a141242e069d6f93210394ee66bcaf8cb565dc56a7a9f4dc12c24bd6bc6de91ef0bab4ce54a2ea2274551dce291a53a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qiita_org (0.1.31)
+    qiita_org (0.1.33)
       colorize
       command_line (> 2.0.0)
       fileutils

data/lib/qiita_org.rb

@@ -9,21 +9,12 @@ require "qiita_org/get"
 require "qiita_org/list"
 require "qiita_org/all"
 require "qiita_org/get_template"
-#require "qiita_org/check_pc_os"
 require "qiita_org/upload"
-#require "qiita_org/get_file_path"
-#require "qiita_org/show_file_and_url"
-#require "qiita_org/decide_option"
 require "qiita_org/get_multiple_files"
 require "qiita_org/base"
-#require "qiita_org/qiita_org_thor"
 
 module QiitaOrg
   class CLI < Thor
-    #    def initialize(*argv)
-    #      super(*argv)
-    #    end
-    #
     def initialize(*argv)
       super(*argv)
       @base = QiitaBase.new()
@@ -39,28 +30,25 @@ module QiitaOrg
     desc "post [FILE] [private/public/teams]", "post to qiita from org"
 
     def post(*argv)
-      #checkos = CheckPcOs.new
-      #os = checkos.return_os()
       os = @base.check_pc_os()
 
       if argv.size > 2
         GetMultipleFiles.new(argv, os, "post").run()
-      elsif argv.size > 1
+      else #if argv.size > 1
         if argv[-1].match(/(.+).org/)
           GetMultipleFiles.new(argv, os, "post").run()
-        end
-      else
-        p ["in qiita_org.rb", argv]
-        p file = argv[0] || "README.org"
-        #p mode = argv[1] || DecideOption.new(file).decide_option()
-        p mode = argv[1] || @base.pick_up_option(file)
-        qiita = QiitaPost.new(file, mode, os)
-        begin
-          qiita.select_option(mode)
-        rescue RuntimeError => e
-          puts $!
         else
-          qiita.run
+          p ["in qiita_org.rb", argv]
+          p file = argv[0] || "README.org"
+          p mode = argv[1] || @base.pick_up_option(file)
+          qiita = QiitaPost.new(file, mode, os)
+          begin
+            qiita.select_option(mode)
+          rescue RuntimeError => e
+            puts $!
+          else
+            qiita.run
+          end
         end
       end
     end
@@ -68,22 +56,19 @@ module QiitaOrg
     desc "upload [FILE] [teams/public/private]", "upload about image to qiita"
 
     def upload(*argv)
-      #checkos = CheckPcOs.new
-      #os = checkos.return_os()
       os = @base.check_pc_os()
 
       if argv.size > 2
         GetMultipleFiles.new(argv, os, "upload").run()
-      elsif argv.size > 1
+      else #if argv.size > 1
         if argv[-1].match(/(.+).org/)
           GetMultipleFiles.new(argv, os, "upload").run()
-        end
-      else
-        p file = argv[0] || "README.org"
-        #p mode = argv[1] || DecideOption.new(file).decide_option()
-        p mode = argv[1] || @base.pick_up_option(file)
+        else
+          p file = argv[0] || "README.org"
+          p mode = argv[1] || @base.pick_up_option(file)
 
-        qiita = QiitaFileUpLoad.new(file, mode, os).upload()
+          qiita = QiitaFileUpLoad.new(file, mode, os).upload()
+        end
       end
     end
 
@@ -109,8 +94,6 @@ module QiitaOrg
     desc "template", "make template.org"
 
     def template(*argv)
-      #checkos = CheckPcOs.new
-      #os = checkos.return_os()
       os = @base.check_pc_os()
       filename = argv[0] || "template.org"
       filename = (filename.include?(".org"))? filename : "#{filename}.org"
@@ -121,7 +104,6 @@ module QiitaOrg
     desc "all [teams/public/private] [options]", "post all org files in the directory"
 
     def all(*argv)
-      #mode = argv[0] || false
       QiitaAll.new(argv).run()
     end
 

data/lib/qiita_org/all.rb

@@ -10,9 +10,10 @@ class QiitaAll
   def run()
     @files.each do |file|
       unless @exclude_files.empty?
-        if @exclude_files.include?(file)
-          next
-        end
+        next if @exclude_files.include?(file)
+        #if @exclude_files.include?(file)
+         # next
+        #end
       end
 
       unless @mode

data/lib/qiita_org/base.rb

@@ -85,4 +85,14 @@ class QiitaBase
       system "xdg-open #{order}"
     end
   end
+
+  def get_report_id(src, option)
+    conts = File.read(src)
+    if conts.match?(/^\#\+qiita_#{option}:\s(.+)/)
+      id = conts.match(/\#\+qiita_#{option}: (.+)/)[1]
+    else
+      id = nil
+    end
+    return id
+  end
 end

data/lib/qiita_org/config.rb

@@ -7,8 +7,6 @@ class QiitaConfig
     @option = option
     @input = input
     if status == "local"
-      #search = SearchConfPath.new(Dir.pwd, Dir.home)
-      #conf_dir = search.search_conf_path()
       conf_dir = QiitaBase.new().search_conf_path(Dir.pwd, Dir.home)
       if @option == "set"
         @setup = File.join(Dir.pwd, ".qiita.conf")

data/lib/qiita_org/error_message.rb

@@ -8,6 +8,8 @@ class ErrorMessage
   def access_token_error(access_token)
     if access_token == ""
       puts "Please setting ACCESS_TOKEN".red
+      puts "Hint: qiita config global access_token 'your access_token'".red
+      puts "Hint: qiita config local access_token 'your access_token'".red
       exit
     end
   end
@@ -15,6 +17,8 @@ class ErrorMessage
   def teams_url_error(teams_url)
     if teams_url == ""
       puts "Please setting teams_url".red
+      puts "Hint: qiita config global teams_url 'https://foge.qiita.com/'".red
+      puts "Hint: qiita config local teams_url 'https://foge.qiita.com/'".red
       exit
     end
   end
@@ -77,8 +81,8 @@ class ErrorMessage
 
   def md_file_exists?(src, res)
     unless File.exists?(src.gsub(".org", ".md"))
-      puts "Can not make #{src.gsub(".org", ".md")}".red
-      puts "Please confirm emacs version.".red
+      puts "Can not transform #{src.gsub(".org", ".md")} from #{src}, please chech org syntax.".red
+      puts "Please confirm emacs version it 26 or more.".red
       exit
     else
       p res

data/lib/qiita_org/get.rb

@@ -3,8 +3,6 @@ require "json"
 require "open-uri"
 require "io/console"
 require "colorize"
-#require "qiita_org/select_path.rb"
-#require "qiita_org/set_config.rb"
 require "qiita_org/error_message.rb"
 require "qiita_org/access_qiita.rb"
 
@@ -13,7 +11,6 @@ class QiitaGet
     @mode = mode
     @get_id = id
     @base = QiitaBase.new()
-    # @selectpath = SelectPath.new()
   end
 
   # select report
@@ -104,7 +101,6 @@ EOS
     @path = "api/v2/items/#{@get_id}"
 
     @items = AccessQiita.new(@access_token, @qiita, @path).access_qiita()
-    #access_qiita()
 
     @title = @items["title"]
     @id = @items["id"]

data/lib/qiita_org/get_multiple_files.rb

@@ -1,8 +1,6 @@
 require "colorize"
-#require "../qiita_org/qiita_org.rb"
 require "qiita_org/post.rb"
 require "qiita_org/upload.rb"
-#require "qiita_org/decide_option.rb"
 
 class GetMultipleFiles
   def initialize(files, os, type)
@@ -17,9 +15,8 @@ class GetMultipleFiles
   end
 
   def run()
-    puts "post files: #{@files}".green
+    puts "#{@type} files: #{@files}".green
     @files.each do |file|
-      #mode = @option || DecideOption.new(file).decide_option()
       mode = @option || QiitaBase.new().pick_up_option(file)
       puts "qiita #{@type} #{file} #{mode}".green
       if @type == "post"

data/lib/qiita_org/get_template.rb

@@ -1,17 +1,13 @@
 require "fileutils"
 require "colorize"
 require "kconv"
-#require "qiita_org/search_conf_path"
 require "qiita_org/error_message.rb"
 
 class QiitaGetTemplate
   def initialize(os, filename)
     @os = os
     @filename = filename
-    #search = SearchConfPath.new(Dir.pwd, Dir.home)
-    # @conf_dir = search.search_conf_path()
     @conf_dir = QiitaBase.new().search_conf_path(Dir.pwd, Dir.home)
-    # check_write_header()
   end
 
   def get_macos_version()
@@ -106,17 +102,6 @@ class QiitaGetTemplate
     end
   end
 
-  def check_write_header()
-    ["name", "email"].each do |src|
-      print "Write your #{src}?(y/n) "
-      ans = STDIN.gets.chomp
-      next if ans == "n"
-      if ans == "y"
-        send("get_#{src}")
-      end
-    end
-  end
-
   def set_name_and_email()
     conf_path = File.join(@conf_dir, ".qiita.conf")
     conf = JSON.load(File.read(conf_path))

data/lib/qiita_org/list.rb

@@ -2,8 +2,6 @@ require "net/https"
 require "json"
 require "open-uri"
 require "colorize"
-#require "qiita_org/select_path.rb"
-#require "qiita_org/set_config.rb"
 require "qiita_org/error_message.rb"
 require "qiita_org/access_qiita.rb"
 
@@ -11,13 +9,11 @@ class QiitaList
   def initialize(mode)
     @mode = mode
     @base = QiitaBase.new
-    # @access_token, @teams_url, @display, @ox_qmd_load_path = SetConfig.new().set_config()
     @access_token, @teams_url, @display, @ox_qmd_load_path = @base.set_config()
     if @mode == "teams"
       ErrorMessage.new().teams_url_error(@teams_url)
     end
 
-    # @qiita, @path = SelectPath.new().select_path(@mode, @teams_url)
     @qiita, @path = @base.select_access_path(@mode, @teams_url)
     @items = AccessQiita.new(@access_token, @qiita, @path).access_qiita()
     view_list()
@@ -35,6 +31,5 @@ class QiitaList
       end
       puts ""
     end
-#    p @items[0]["user"]["id"]
   end
 end

data/lib/qiita_org/md_converter_for_image.rb

@@ -1,6 +1,6 @@
 class MdConverter
   def initialize()
-    # @lines = lines
+
   end
 
   def convert_for_image(lines)

data/lib/qiita_org/post.rb

@@ -5,9 +5,7 @@ require "json"
 require "command_line/global"
 require "colorize"
 require "qiita_org/md_converter_for_image"
-#require "qiita_org/set_config.rb"
 require "qiita_org/error_message"
-require "qiita_org/file_open.rb"
 require "qiita_org/access_qiita.rb"
 
 class QiitaPost
@@ -23,10 +21,6 @@ class QiitaPost
     m = conts.match(/\#\+(TITLE|title|Title): (.+)/)
     @title = m ?  m[2] : "テスト"
     @tags = if m = conts.match(/\#\+(TAG|tag|Tag|tags|TAGS|Tags): (.+)/)
-              #if m[2].count(",") >= 5
-               # puts "The maximum number of tag is five. Please delete some tags.".red
-                #exit
-              #end
               ErrorMessage.new().many_tags_error(m[2])
               m[2].split(",").inject([]) do |l, c|
                  l << { name: c.strip } #, versions: []}
@@ -42,7 +36,6 @@ class QiitaPost
   def convert_org_to_md()
     command = "emacs #{@src} --batch -l #{@ox_qmd_load_path} -f org-qmd-export-to-markdown --kill"
     res = command_line command
-    #p res
     ErrorMessage.new().md_file_exists?(@src, res)
   end
 
@@ -54,15 +47,17 @@ class QiitaPost
   end
 
   # patch or post selector by qiita_id
-  def select_patch_or_post(conts, option)
-    m = []
+  def select_patch_or_post(src, option)
+    #m = []
     patch = false
-    if m = conts.match(/\#\+qiita_#{option}: (.+)/)
-      qiita_id = m[1]
-      patch = true
-    else
-      qiita_id = ""
-    end
+    qiita_id = @base.get_report_id(src, option)
+    patch = true if qiita_id != nil
+    #if m = conts.match(/\#\+qiita_#{option}: (.+)/)
+     # qiita_id = m[1]
+      #patch = true
+    #else
+     # qiita_id = ""
+    #end
     return qiita_id, patch
   end
 
@@ -93,8 +88,6 @@ class QiitaPost
 
   def select_option(option)
     qiita = (option == "teams")? @teams_url : "https://qiita.com/"
-    #qiita = (option == "teams")? "https://nishitani.qiita.com/" :
-     # "https://qiita.com/"
     case option
     when "teams", "qiita", "public", "open"
       private = false
@@ -171,7 +164,6 @@ class QiitaPost
   def run()
     @conts = File.read(@src)
     @title, @tags = get_title_tags(@conts)
-    # @access_token, @teams_url, @display, @ox_qmd_load_path = SetConfig.new().set_config()
     @access_token, @teams_url, @display, @ox_qmd_load_path = @base.set_config()
 
     if @option == "teams"
@@ -181,15 +173,14 @@ class QiitaPost
     convert_org_to_md()
     add_source_path_in_md()
     @lines = MdConverter.new().convert_for_image(@lines)
-    @qiita_id, @patch = select_patch_or_post(@conts, @option)
+    @qiita_id, @patch = select_patch_or_post(@src, @option)
     @conts, @option = check_change_public(@conts, @option, @qiita_id) if (@patch and @option == "private")
     @twitter = select_twitter(@conts, @option)
     @qiita, @private = select_option(@option)
     @res = qiita_post()
     get_and_print_qiita_return()
 
-    #open_qiita()
-    FileOpen.new(@os).file_open(@res_body["url"]) if @display != "suppress"
+    @base.file_open(@os, @res_body["url"]) if @display != "suppress"
 
     add_qiita_id_on_org()
 

data/lib/qiita_org/upload.rb

@@ -1,9 +1,5 @@
 require "colorize"
 require "io/console"
-#require "qiita_org/get_file_path.rb"
-#require "qiita_org/show_file_and_url.rb"
-require "qiita_org/file_open.rb"
-#require "qiita_org/set_config.rb"
 require "qiita_org/access_qiita.rb"
 
 class QiitaFileUpLoad
@@ -11,31 +7,21 @@ class QiitaFileUpLoad
     @src = src
     @option = (option == "qiita" || option == "open")? "public" : option
     @os = os
-    @fileopen = FileOpen.new(@os)
-    # @access_token, @teams_url, @display, @ox_qmd_load_path = SetConfig.new().set_config()
+    @base = QiitaBase.new()
     @access_token, @teams_url, @display, @ox_qmd_load_path = QiitaBase.new().set_config()
-    if @option == "teams"
-      ErrorMessage.new().teams_url_error(@teams_url)
-    end
+    ErrorMessage.new().teams_url_error(@teams_url) if @option == "teams"
   end
 
   def upload()
-    #paths = GetFilePath.new(@src).get_file_path()
     paths = get_file_path(@src)
     unless paths.empty?
-      #showfile = ShowFile.new(paths, @src, @option, @os)
-      #showfile.open_file_dir()
       open_file_dir(paths)
-      #showfile.open_qiita()
       open_qiita()
 
       puts "Overwrite file URL's on #{@src}? (y/n)".green
       ans = STDIN.getch
 
-      if ans == "y"
-        #showfile.input_url_to_org()
-        input_url_to_org(paths)
-      end
+      input_url_to_org(paths) if ans == "y"
     else
       puts "file path is empty.".red
     end
@@ -60,27 +46,19 @@ class QiitaFileUpLoad
   def open_file_dir(paths)
     previous_paths = []
     previous_paths << File.join(paths[0].split("/")[0..-2])
-    @fileopen.file_open(File.join(paths[0].split("/")[0..-2]))
+    @base.file_open(@os, File.join(paths[0].split("/")[0..-2]))
 
     paths.each do |path|
       dir_path = File.join(path.split("/")[0..-2])
       unless previous_paths.include?(dir_path)
         previous_paths << dir_path
-        @fileopen.file_open(dir_path)
+        @base.file_open(@os, dir_path)
       end
     end
   end
 
   def open_qiita()
-    conts = File.read(@src)
-    id = conts.match(/\#\+qiita_#{@option}: (.+)/)[1]
-
-=begin
-    @access_token, @teams_url, @display, @ox_qmd_load_path = SetConfig.new().set_config()
-    if @option == "teams"
-      ErrorMassage.new().teams_url_error(@teams_url)
-    end
-=end
+    id = QiitaBase.new().get_report_id(@src, @option)
 
     qiita = (@option == "teams") ? @teams_url : "https://qiita.com/"
     path = "api/v2/items/#{id}"
@@ -88,7 +66,7 @@ class QiitaFileUpLoad
     @access = AccessQiita.new(@access_token, qiita, path)
     items = @access.access_qiita()
 
-    @fileopen.file_open(items["url"])
+    @base.file_open(@os, items["url"])
   end
 
   def input_url_to_org(paths)

data/lib/qiita_org/version.rb

@@ -1,3 +1,3 @@
 module QiitaOrg
-  VERSION = "0.1.33"
+  VERSION = "0.1.34"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qiita_org
 version: !ruby/object:Gem::Version
-  version: 0.1.33
+  version: 0.1.34
 platform: ruby
 authors:
 - Kenta Yamamoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -562,10 +562,7 @@ files:
 - gems/ruby/2.7.0/cache/yard-activesupport-concern-0.0.1.gem
 - gems/ruby/2.7.0/extensions/x86_64-darwin-17/2.7.0/ffi-1.13.1/ffi_c.bundle
 - gems/ruby/2.7.0/extensions/x86_64-darwin-17/2.7.0/ffi-1.13.1/gem.build_complete
-- gems/ruby/2.7.0/extensions/x86_64-darwin-17/2.7.0/ffi-1.13.1/gem_make.out
-- gems/ruby/2.7.0/extensions/x86_64-darwin-17/2.7.0/ffi-1.13.1/mkmf.log
 - gems/ruby/2.7.0/extensions/x86_64-darwin-17/2.7.0/redcarpet-3.5.0/gem.build_complete
-- gems/ruby/2.7.0/extensions/x86_64-darwin-17/2.7.0/redcarpet-3.5.0/gem_make.out
 - gems/ruby/2.7.0/extensions/x86_64-darwin-17/2.7.0/redcarpet-3.5.0/redcarpet.bundle
 - gems/ruby/2.7.0/gems/coderay-1.1.3/MIT-LICENSE
 - gems/ruby/2.7.0/gems/coderay-1.1.3/README_INDEX.rdoc
@@ -784,7 +781,6 @@ files:
 - gems/ruby/2.7.0/gems/ffi-1.13.1/ext/ffi_c/libffi-x86_64-darwin17/.libs/libffi.lai
 - gems/ruby/2.7.0/gems/ffi-1.13.1/ext/ffi_c/libffi-x86_64-darwin17/.libs/libffi_convenience.la
 - gems/ruby/2.7.0/gems/ffi-1.13.1/ext/ffi_c/libffi-x86_64-darwin17/Makefile
-- gems/ruby/2.7.0/gems/ffi-1.13.1/ext/ffi_c/libffi-x86_64-darwin17/config.log
 - gems/ruby/2.7.0/gems/ffi-1.13.1/ext/ffi_c/libffi-x86_64-darwin17/config.status
 - gems/ruby/2.7.0/gems/ffi-1.13.1/ext/ffi_c/libffi-x86_64-darwin17/fficonfig.h
 - gems/ruby/2.7.0/gems/ffi-1.13.1/ext/ffi_c/libffi-x86_64-darwin17/include/Makefile
@@ -2562,7 +2558,6 @@ files:
 - lib/qiita_org/config.json
 - lib/qiita_org/config.rb
 - lib/qiita_org/error_message.rb
-- lib/qiita_org/file_open.rb
 - lib/qiita_org/get.rb
 - lib/qiita_org/get_multiple_files.rb
 - lib/qiita_org/get_template.rb
@@ -2571,6 +2566,7 @@ files:
 - lib/qiita_org/md_converter_for_image.rb
 - lib/qiita_org/old_programs/check_pc_os.rb
 - lib/qiita_org/old_programs/decide_option.rb
+- lib/qiita_org/old_programs/file_open.rb
 - lib/qiita_org/old_programs/get_file_path.rb
 - lib/qiita_org/old_programs/get_file_url.rb
 - lib/qiita_org/old_programs/search_conf_path.rb