qiita_org 0.1.30 → 0.1.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f288634b1ce2de7e2a34ddc3fd7399cdb2a1b9e63e6d4b2523ec7cf3fc84601
-  data.tar.gz: a08fb2191f4e6cc80e3c40701df53bae8ae983cfaa225dfba57ede608d846c97
+  metadata.gz: 6c72fb0ca25fa98881ffa0e4f000a6d18c0ad742f7771b501d5b8cc8a7d1877f
+  data.tar.gz: 6e131d7a573369378f002f155900851f1b11f7fe522778c9ee637b3098596a1c
 SHA512:
-  metadata.gz: 0d01c3f1937f7033f7e4a7e2989492251bc53e18e1717ba394a0385afefc217df08a756c61a3cb580e24139199de80ef065d34019d122f00443359879b3cc865
-  data.tar.gz: afd6c322d5d5de441b55b5784e630ca9c401b5f028ce7636d68a8b12dfec8a3b0feb07dd8d458043077e1d3130a65a617f946784be87266a8044c26db18595b7
+  metadata.gz: fab87567e4e52f3f3bb74f3cd32807e7b1ef3bcfd19fbd019891a0218489373d5ec1be694389c5815be11fc5a397287d9203e3bde9e04048a6a2a28f43e3d88a
+  data.tar.gz: 0daa3405f652e9c79d91e02f3b88403dc86f3d6f67012cd0f8e73123b6141d8651ae01c66ed85eb6d40d6bcdd27bea10a5c67e9a1ccd33dc3cef59c77a343cb1

data/Gemfile.lock

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

data/lib/qiita_org.rb

@@ -9,22 +9,15 @@ 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/qiita_org_thor"
+require "qiita_org/base"
 
 module QiitaOrg
   class CLI < Thor
-    #    def initialize(*argv)
-    #      super(*argv)
-    #    end
-    #
     def initialize(*argv)
       super(*argv)
+      @base = QiitaBase.new()
     end
 
     desc "say_hello", "say_hello"
@@ -37,24 +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[-1].match(/(.+).org/) && argv.size != 1
-        GetMultipleFiles.new(argv, os, "post").run()
-      else
-        p ["in qiita_org.rb", argv]
-        p file = argv[0] || "README.org"
-        p mode = argv[1] || DecideOption.new(file).decide_option()
-        qiita = QiitaPost.new(file, mode, os)
-        begin
-          qiita.select_option(mode)
-        rescue RuntimeError => e
-          puts $!
+      else #if argv.size > 1
+        if argv[-1].match(/(.+).org/)
+          GetMultipleFiles.new(argv, os, "post").run()
         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
@@ -62,35 +56,20 @@ 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[-1].match(/(.+).org/) && argv.size != 1
-        GetMultipleFiles.new(argv, os, "upload").run()
-      else
-        p file = argv[0] || "README.org"
-        p mode = argv[1] || DecideOption.new(file).decide_option()
+      else #if argv.size > 1
+        if argv[-1].match(/(.+).org/)
+          GetMultipleFiles.new(argv, os, "upload").run()
+        else
+          p file = argv[0] || "README.org"
+          p mode = argv[1] || @base.pick_up_option(file)
 
-        qiita = QiitaUpLoad.new(file, mode, os).upload()
-      end
-=begin
-      getpath = GetFilePath.new(file)
-      paths = getpath.get_file_path()
-      unless paths.empty?
-        showfile = ShowFile.new(paths, file, mode, os)
-        showfile.open_file_dir()
-        showfile.open_qiita()
-
-        puts "Input file URL's on #{file}? (y/n)".green
-        ans = STDIN.getch
-
-        if ans == "y"
-          showfile.input_url_to_org()
+          qiita = QiitaFileUpLoad.new(file, mode, os).upload()
         end
       end
-=end
     end
 
     desc "config [global/local] [option] [input]", "set config"
@@ -115,16 +94,16 @@ 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"
 
-      template = QiitaGetTemplate.new(os).run()
+      template = QiitaGetTemplate.new(os, filename).run()
     end
 
     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/access_qiita.rb

@@ -20,8 +20,6 @@ class AccessQiita
                           "Authorization" => "#{headers["Authorization"]}",
                           )
     rescue => e
-      #puts "#{$!}".red
-      #exit
       ErrorMessage.new().qiita_access_error(e)
     else
       items = JSON.parse(response.read)

data/lib/qiita_org/all.rb

@@ -2,7 +2,6 @@ require "colorize"
 
 class QiitaAll
   def initialize(argv)
-    # @mode = mode
     check_options(argv)
     @files = Dir.glob("*.org")
     p @files
@@ -11,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

@@ -0,0 +1,98 @@
+require "colorize"
+require "qiita_org/error_message.rb"
+
+class QiitaBase
+  def initialize()
+
+  end
+
+  def check_pc_os()
+    if system "sw_vers"
+      return os = "mac"
+    elsif system "wmic.exe os get caption"
+      return os = "windows"
+    else
+      return nil
+    end
+  end
+
+  def pick_up_option(src)
+    lines = File.readlines(src)
+
+    lines.each do |line|
+      m = []
+      if m = line.match(/\#\+qiita_(.+): (.+)/)
+        option = m[1]
+        unless option == "public" || option == "teams" || option == "private"
+          next
+        end
+        return option
+      end
+    end
+    return option = "private"
+  end
+
+  def search_conf_path(dir, home)
+    while dir != home
+      if File.exists?(File.join(dir, ".qiita.conf"))
+        return dir
+      else
+        dir = dir.match(/(.+)\//)[1]
+      end
+    end
+    return dir
+  end
+
+  def select_access_path(mode, teams_url)
+    case mode
+    when "teams"
+      qiita = teams_url
+      path = "api/v2/items?page=1&per_page=100"
+    else
+      qiita = "https://qiita.com/"
+      path = "api/v2/authenticated_user/items?page=1&per_page=100"
+    end
+    return qiita, path
+  end
+
+  def set_config()
+    conf_dir = search_conf_path(Dir.pwd, Dir.home)
+    lib = File.expand_path("../../../lib", __FILE__)
+    if conf_dir != Dir.home
+      puts "config file path: #{conf_dir.gsub(Dir.home, "~")}".green
+    else
+      puts "config file path: #{conf_dir}".green
+    end
+
+    conf_path = File.join(conf_dir, ".qiita.conf")
+    conf = JSON.load(File.read(conf_path))
+    access_token = conf["access_token"]
+    teams_url = conf["teams_url"]
+    display = conf["display"]
+    ox_qmd_load_path = File.join(lib, "qiita_org", "ox-qmd", "ox-qmd")
+
+    ErrorMessage.new().access_token_error(access_token)
+
+    return access_token, teams_url, display, ox_qmd_load_path
+  end
+
+  def file_open(os, order)
+    if os == "mac"
+      system "open #{order}"
+    elsif os == "windows"
+      system "explorer.exe #{order}"
+    else
+      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,7 @@ 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")
       else

data/lib/qiita_org/error_message.rb

@@ -7,14 +7,18 @@ class ErrorMessage
 
   def access_token_error(access_token)
     if access_token == ""
-      puts "Please setting ACCESS_TOKEN".red
+      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
 
   def teams_url_error(teams_url)
     if teams_url == ""
-      puts "Please setting teams_url".red
+      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
@@ -57,17 +61,17 @@ class ErrorMessage
     check = true
 
     if conf["name"] == ""
-      puts "Please set your name in config".red
-      puts "Hint: qiita config global name 'YOUR NAME'".red
-      puts "Hint: qiita config local name 'YOUR NAME'".red
+      puts "Please set your name in config.".red
+      puts "Hint: qiita config global name 'YOUR NAME'.".red
+      puts "Hint: qiita config local name 'YOUR NAME'.".red
 #      system "rm template.org"
       check = false
     end
 
     if conf["email"] == ""
-      puts "Please set your email in config".red
-      puts "Hint: qiita config global email 'youremail@example.com'".red
-      puts "Hint: qiita config local name 'youremail@example.com'".red
+      puts "Please set your email in config.".red
+      puts "Hint: qiita config global email 'your_email@example.com'.".red
+      puts "Hint: qiita config local name 'your_email@example.com'.".red
       check = false
     end
     unless check
@@ -77,8 +81,9 @@ 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 convert org doc to markdown.".red
+      puts 'Please confirm emacs version above 26.'.red
+      puts "Next, check links in the org doc, as converting in emacs by 'ctrl+c, ctrl+e, h, o'.".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"
 
@@ -12,47 +10,9 @@ class QiitaGet
   def initialize(mode, id)
     @mode = mode
     @get_id = id
-    @selectpath = SelectPath.new()
+    @base = QiitaBase.new()
   end
 
-  # select path
-=begin
-  def select_path(mode)
-    case mode
-    when "teams"
-      qiita = @teams_url
-      path = "api/v2/items?page=1&per_page=100"
-    else
-      qiita = "https://qiita.com/"
-      path = "api/v2/authenticated_user/items?page=1&per_page=100"
-    end
-    return qiita, path
-  end
-=end
-
-  # access qiita
-=begin
-  def access_qiita()
-    uri = URI.parse(@qiita + @path)
-
-    headers = { "Authorization" => "Bearer # {@access_token}",
-      "Content-Type" => "application/json" }
-
-    begin
-      response = URI.open(
-                          "# {uri}",
-                          "Authorization" => "# {headers["Authorization"]}",
-                          )
-      #raise "NOT FOUND: # {@get_id} report".red
-    rescue => e
-      puts "# {$!}".red
-      exit
-    else
-      @items = JSON.parse(response.read)
-    end
-  end
-=end
-
   # select report
   def select_report()
     @items.each do |item|
@@ -141,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"]
@@ -159,13 +118,13 @@ EOS
   end
 
   def run()
-    @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
 
     if @get_id == nil
-      @qiita, @path = @selectpath.select_path(@mode, @teams_url)
+      @qiita, @path = @base.select_access_path(@mode, @teams_url)
       @items = AccessQiita.new(@access_token, @qiita, @path).access_qiita()
       select_report()
     else

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,9 @@ 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"
         qiita = QiitaPost.new(file, mode, @os)
@@ -31,7 +29,7 @@ class GetMultipleFiles
           qiita.run
         end
       elsif @type == "upload"
-        UpLoad.new(file, mode, @os).upload()
+        QiitaFileUpLoad.new(file, mode, @os).upload()
       end
     end
   end

data/lib/qiita_org/get_template.rb

@@ -1,15 +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)
+  def initialize(os, filename)
     @os = os
-    search = SearchConfPath.new(Dir.pwd, Dir.home)
-    @conf_dir = search.search_conf_path()
-    # check_write_header()
+    @filename = filename
+    @conf_dir = QiitaBase.new().search_conf_path(Dir.pwd, Dir.home)
   end
 
   def get_macos_version()
@@ -18,9 +16,9 @@ class QiitaGetTemplate
     m = []
     m = version.match(/ProductName:\t(.+)\nProductVersion:\t(.+)\nBuildVersion:\t(.+)\n/)
     system 'rm hoge.txt'
-    conts = File.read("template.org")
+    conts = File.read(@filename)
     conts << "![#{m[1]}-#{m[2]}](https://img.shields.io/badge/#{m[1].gsub(" ", "")}-#{m[2]}-brightgreen) "
-    File.write("template.org", conts) # + "# {m[1]}: # {m[2]}\n")
+    File.write(@filename, conts) # + "# {m[1]}: # {m[2]}\n")
   end
 
   def get_windowsos_version()
@@ -33,9 +31,9 @@ class QiitaGetTemplate
     m2 = version2.match(/OSArchitecture\n(.+)-bit/)
     system 'rm hoge1.txt'
     system 'rm hoge2.txt'
-    conts = File.read("template.org")
+    conts = File.read(@filename)
     conts << "![#{m1[1]}-#{m1[2]}](https://img.shields.io/badge/#{m1[1].gsub(" ", "")}#{m1[2]}-#{m2[1]}bit-brightgreen) "
-    File.write("template.org", conts) # + "# {m[1]}: # {m[2]}\n")
+    File.write(@filename, conts) # + "# {m[1]}: # {m[2]}\n")
   end
 
   def get_ubuntu_version()
@@ -44,9 +42,9 @@ class QiitaGetTemplate
     m = []
     m = version.match(/(.+) (.+) LTS /)
     system 'rm hoge.txt'
-    conts = File.read("template.org")
+    conts = File.read(@filename)
     conts << "![#{m[1]}-#{m[2]}](https://img.shields.io/badge/#{m[1]}-#{m[2]}-brightgreen) "
-    File.write("template.org", conts)
+    File.write(@filename, conts)
   end
 
   def get_ruby_version()
@@ -55,9 +53,9 @@ class QiitaGetTemplate
     m = []
     m = version.match(/ruby (.+) \((.+)/)
     system 'rm hoge.txt'
-    conts = File.read("template.org")
+    conts = File.read(@filename)
     conts << "![ruby-#{m[1]}](https://img.shields.io/badge/ruby-#{m[1].gsub(" ", "")}-brightgreen) "
-    File.write("template.org", conts) # + "ruby: # {m[1]}\n")
+    File.write(@filename, conts) # + "ruby: # {m[1]}\n")
   end
 
   # cp template.org
@@ -65,11 +63,11 @@ class QiitaGetTemplate
     lib = File.expand_path("../../../lib", __FILE__)
     cp_file = File.join(lib, "qiita_org", "template.org")
 
-    if File.exists?("./template.org")
-      puts "template.org exists.".red
+    if File.exists?("./#{@filename}")
+      puts "#{@filename} exists.".red
       exit
     else
-      FileUtils.cp(cp_file, ".", verbose: true)
+      FileUtils.cp(cp_file, @filename, verbose: true)
     end
   end
 
@@ -104,42 +102,15 @@ 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 get_name()
-    conts = File.readlines("template.org")
-    p "Type your name"
-    name = STDIN.gets
-    conts[3] = "#+AUTHOR: #{name}"
-    File.write("template.org", conts.join)
-  end
-
-  def get_email()
-    conts = File.readlines("template.org")
-    p "Type your email"
-    email = STDIN.gets
-    conts[4] = "#+EMAIL:     (concat \"#{email.chomp}\")\n"
-    File.write("template.org", conts.join)
-  end
-
   def set_name_and_email()
     conf_path = File.join(@conf_dir, ".qiita.conf")
     conf = JSON.load(File.read(conf_path))
     name = conf["name"]
     email = conf["email"]
-    conts = File.readlines("template.org")
+    conts = File.readlines(@filename)
     conts[3] = "#+AUTHOR: #{name}\n"
     conts[4] = "#+EMAIL:     (concat \"#{email}\")\n"
-    File.write("template.org", conts.join)
+    File.write(@filename, conts.join)
   end
 
   def run()

data/lib/qiita_org/list.rb

@@ -2,54 +2,23 @@ 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"
 
 class QiitaList
   def initialize(mode)
     @mode = mode
-    @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 = @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()
   end
 
-  # select path
-=begin
-  def select_path()
-    case @mode
-    when "teams"
-      @qiita = @teams_url
-      @path = "api/v2/items?page=1&per_page=100"
-    else
-      @qiita = "https://qiita.com/"
-      @path = "api/v2/authenticated_user/items?page=1&per_page=100"
-    end
-  end
-=end
-
-  # access qiita
-=begin
-  def access_qiita()
-    uri = URI.parse(@qiita + @path)
-
-    headers = { "Authorization" => "Bearer # {@access_token}",
-      "Content-Type" => "application/json" }
-
-    response = URI.open(
-                        "# {uri}",
-                        "Authorization" => "# {headers["Authorization"]}",
-                        )
-    @items = JSON.parse(response.read)
-  end
-=end
-
   def view_list()
     @items.each do |item|
       puts "title: #{item["title"]}"
@@ -62,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,15 +5,15 @@ 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
   def initialize(file, option, os)
     @src = file
     @option = (option == "qiita" || option == "open")? "public" : option
     @os = os
+    @base = QiitaBase.new
   end
 
   public
@@ -21,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: []}
@@ -40,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
 
@@ -52,16 +47,38 @@ 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
+    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
+
+  def check_change_public(conts, option, id)
+    qiita = "https://qiita.com/"
+    path = "api/v2/items/#{id}"
+    items = AccessQiita.new(@access_token, qiita, path).access_qiita()
+
+    if items["private"]
+      return conts, option
     else
-      qiita_id = ""
+      option = "public"
+      lines = File.readlines(@src)
+      file = File.open(@src, "w")
+      lines.each_with_index do |line, i|
+        lines[i] = "#+qiita_#{option}: #{id}\n" if line.match(/\#\+qiita_private: (.+)/)
+        file.print(lines[i])
+      end
+      conts = File.read(@src)
+      return conts, option
     end
-    return qiita_id, patch
   end
 
   # check twitter post
@@ -71,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
@@ -146,24 +161,10 @@ class QiitaPost
     end
   end
 
-  # open qiita
-=begin
-  def open_qiita()
-    if @os == "mac"
-      system "open # {@res_body["url"]}"
-    elsif @os == "windows"
-      system "explorer.exe # {@res_body["url"]}"
-    else
-      system "open # {@res_body["url"]}"
-      system "xdg-open # {@res_body["url"]}"
-    end
-  end
-=end
-
   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"
       ErrorMessage.new().teams_url_error(@teams_url)
@@ -172,14 +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,33 +1,27 @@
 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 QiitaUpLoad
+class QiitaFileUpLoad
   def initialize(src, option, os)
     @src = src
     @option = (option == "qiita" || option == "open")? "public" : option
     @os = os
-    @fileopen = FileOpen.new(@os)
+    @base = QiitaBase.new()
+    @access_token, @teams_url, @display, @ox_qmd_load_path = QiitaBase.new().set_config()
+    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)
+    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()
+      open_file_dir(paths)
+      open_qiita()
 
       puts "Overwrite file URL's on #{@src}? (y/n)".green
       ans = STDIN.getch
 
-      if ans == "y"
-        showfile.input_url_to_org()
-      end
+      input_url_to_org(paths) if ans == "y"
     else
       puts "file path is empty.".red
     end
@@ -52,32 +46,27 @@ class QiitaUpLoad
   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]
-
-    @access_token, @teams_url, @display, @ox_qmd_load_path = SetConfig.new().set_config()
-    if @option == "teams"
-      ErrorMassage.new().teams_url_error(@teams_url)
-    end
+    id = QiitaBase.new().get_report_id(@src, @option)
 
     qiita = (@option == "teams") ? @teams_url : "https://qiita.com/"
     path = "api/v2/items/#{id}"
 
-    items = AccessQiita.new(@access_token, qiita, path).access_qiita()
+    @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)
@@ -87,7 +76,12 @@ class QiitaUpLoad
 
     paths.each do |path|
       file_name = File.basename(path).strip
-      url = get_file_url(id, file_name)
+      #url = (get_file_url(id, file_name)) ? @file_url : next
+      if get_file_url(id, file_name)
+        url = @file_url
+      else
+        next
+      end
       lines.each_with_index do |line, i|
         if line.match(/\[\[file:#{path}\]\]/)
           lines[i] = "[[#{url}][file:#{path}]]\n"
@@ -97,4 +91,20 @@ class QiitaUpLoad
 
     File.write(@src, lines.join)
   end
+
+  def get_file_url(id, file_name)
+    qiita = (@option == "teams")? @teams_url : "https://qiita.com/"
+    path = "api/v2/items/#{@id}"
+
+    items = @access.access_qiita()
+
+    if items["body"].match?(/\!\[#{file_name}\]\(((.+))\)/)
+      @file_url = items["body"].match(/\!\[#{file_name}\]\(((.+))\)/)[2]
+      puts "Wrote #{file_name}'s URL".green
+      return true
+    else
+      puts "Can not find #{file_name}'s URL".red
+      return false
+    end
+  end
 end

data/lib/qiita_org/version.rb

@@ -1,3 +1,3 @@
 module QiitaOrg
-  VERSION = "0.1.30"
+  VERSION = "0.1.35"
 end

data/tests/test.org

@@ -1,4 +1,5 @@
-#+qiita_private: e87e38157a72b4c2e839
+#+qiita_private: 4a238f55b2014ae6494e
+# +qiita_private: e87e38157a72b4c2e839
 # +qiita_private: 5f8c73e8007e52ef3f40
 # +qiita_private: 4decbf7a81ef2327643f
 #+OPTIONS: ^:{}

data/tests/test2.org

@@ -1,4 +1,3 @@
-#+qiita_teams: 7e95d62ebdbedd022256
 #+qiita_private: 6ce39fa8ae7f7a472cf2
 #+OPTIONS: ^:{}
 #+STARTUP: indent nolineimages
@@ -19,6 +18,6 @@ fogefoge
 #+ATTR_LATEX: :width 8cm
 [[https://qiita-image-store.s3.ap-northeast-1.amazonaws.com/0/612049/ebf505d2-6960-6bb9-20f0-e16dab142f4a.png][file:../figs/fig1.png]]
 
-[[https://qiita-image-store.s3.ap-northeast-1.amazonaws.com/0/612049/ebf505d2-6960-6bb9-20f0-e16dab142f4a.png][file:../figs/fig1.png]]
+[[file:../figs/fig2.png]]
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qiita_org
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.35
 platform: ruby
 authors:
 - Kenta Yamamoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-26 00:00:00.000000000 Z
+date: 2020-12-21 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
@@ -2558,32 +2554,31 @@ files:
 - lib/qiita_org/.qiita.conf
 - lib/qiita_org/access_qiita.rb
 - lib/qiita_org/all.rb
-- lib/qiita_org/check_pc_os.rb
+- lib/qiita_org/base.rb
 - lib/qiita_org/config.json
 - lib/qiita_org/config.rb
-- lib/qiita_org/decide_option.rb
 - lib/qiita_org/error_message.rb
-- lib/qiita_org/file_open.rb
 - lib/qiita_org/get.rb
-- lib/qiita_org/get_file_path.rb
-- lib/qiita_org/get_file_url.rb
 - lib/qiita_org/get_multiple_files.rb
 - lib/qiita_org/get_template.rb
-- lib/qiita_org/hoge.txt
 - lib/qiita_org/list.rb
 - 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
+- lib/qiita_org/old_programs/select_path.rb
+- lib/qiita_org/old_programs/set_config.rb
+- lib/qiita_org/old_programs/show_file_and_url.rb
 - lib/qiita_org/ox-qmd/ox-qmd.el
 - lib/qiita_org/post.rb
-- lib/qiita_org/search_conf_path.rb
-- lib/qiita_org/select_path.rb
-- lib/qiita_org/set_config.rb
-- lib/qiita_org/show_file_and_url.rb
 - lib/qiita_org/template.org
 - lib/qiita_org/upload.rb
 - lib/qiita_org/version.rb
 - qiita_org.gemspec
 - tests/hoge.rb
-- tests/template.org
 - tests/test.html
 - tests/test.org
 - tests/test2.org

data/lib/qiita_org/hoge.txt

@@ -1,3 +0,0 @@
-ProductName:	Mac OS X
-ProductVersion:	10.13.3
-BuildVersion:	17D102

data/tests/template.org

@@ -1,14 +0,0 @@
-#+qiita_private: baededc5aa906407da33
-#+OPTIONS: ^:{}
-#+STARTUP: indent nolineimages
-#+TITLE: title
-#+AUTHOR: Kenta Yamamoto
-#+EMAIL:     (concat "doi35077@kwansei.ac.jp")
-#+LANGUAGE:  jp
-# +OPTIONS:   H:4 toc:t num:2
-#+OPTIONS:   toc:nil
-#+TAG: tag1, tag2
-#+TWITTER: off
-# +SETUPFILE: ~/.emacs.d/org-mode/theme-readtheorg.setup
-
-![Mac OS X-10.13.3](https://img.shields.io/badge/MacOSX-10.13.3-brightgreen) ![ruby-2.7.0p0](https://img.shields.io/badge/ruby-2.7.0p0-brightgreen)