qiita_org 0.1.21 → 0.1.35

data/lib/qiita_org/md_converter_for_image.rb

@@ -1,25 +1,25 @@
 class MdConverter
-  def initialize(lines)
-    @lines = lines
+  def initialize()
+
   end
 
-  def convert_for_image()
-    @lines.each_with_index do |line, i|
+  def convert_for_image(lines)
+    lines.each_with_index do |line, i|
       m = []
       if m = line.match(/\[\!\[img\]\((.+) "(.+)"\)\]\((.+)\)/)
         path = File.basename(m[1])
         url = m[3]
-        @lines[i] = "![#{path}](#{url})\n"
+        lines[i] = "![#{path}](#{url})\n"
       elsif m = line.match(/\[\!\[img\]\((.+)\)\]\((.+)\)/)
         path = File.basename(m[1])
         url = m[2]
-        @lines[i] = "![#{path}](#{url})\n"
+        lines[i] = "![#{path}](#{url})\n"
       else
         next
       end
     end
 
-    return @lines
+    return lines
   end
 end
 

data/lib/qiita_org/{decide_option.rb → old_programs/decide_option.rb}

@@ -7,8 +7,12 @@ class DecideOption
     lines = File.readlines(@src)
 
     lines.each do |line|
-      if line.match(/\#\+qiita_(.+): (.+)/)
-        option = line.match(/\#\+qiita_(.+): (.+)/)[1]
+      m = []
+      if m = line.match(/\#\+qiita_(.+): (.+)/)
+        option = m[1] #line.match(/\#\+qiita_(.+): (.+)/)[1]
+        unless option == "public" || option == "teams" || option == "private"
+          next
+        end
         return option
       end
     end

data/lib/qiita_org/old_programs/file_open.rb

@@ -0,0 +1,15 @@
+class FileOpen
+  def initialize(os)
+    @os = os
+  end
+
+  def file_open(order)
+    if @os == "mac"
+      system "open #{order}"
+    elsif @os == "windows"
+      system "explorer.exe #{order}"
+    else
+      system "xdg-open #{order}"
+    end
+  end
+end

data/lib/qiita_org/{get_file_url.rb → old_programs/get_file_url.rb}

@@ -3,30 +3,26 @@ require "json"
 require "open-uri"
 require "io/console"
 require "colorize"
-require "qiita_org/search_conf_path.rb"
+require "qiita_org/set_config.rb"
+require "qiita_org/error_message.rb"
+require "qiita_org/access_qiita.rb"
 
 class GetFileUrl
   def initialize(id, file, mode)
     @id = id
     @file = file
     @mode = (mode == "qiita" || mode == "open")? "public" : mode
-    search = SearchConfPath.new(Dir.pwd, Dir.home)
-    @conf_dir = search.search_conf_path()
-    set_config()
-  end
-
-  def set_config()
-    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"]
+    @access_token, @teams_url, @display, @ox_qmd_load_path = SetConfig.new().set_config()
+    if @mode == "teams"
+      ErrorMessage.new().teams_url_error(@teams_url)
+    end
   end
 
   def get_file_url()
     qiita = (@mode == "teams")? @teams_url : "https://qiita.com/"
     path = "api/v2/items/#{@id}"
 
-    items = access_qiita(@access_token, qiita, path)
+    items = AccessQiita.new(@access_token, qiita, path).access_qiita()
 
     file_url = items["body"].match(/\!\[#{@file}\]\(((.+))\)/)[2]
     return file_url
@@ -34,6 +30,7 @@ class GetFileUrl
     #File.write("url_text.md", items["body"])
   end
 
+=begin
   def access_qiita(access_token, qiita, path)
     uri = URI.parse(qiita + path)
 
@@ -41,10 +38,11 @@ class GetFileUrl
                 "Content-Type" => "application/json" }
 
     response = URI.open(
-      "#{uri}",
-      "Authorization" => "#{headers["Authorization"]}",
+      "# {uri}",
+      "Authorization" => "# {headers["Authorization"]}",
     )
     items = JSON.parse(response.read)
     return items
   end
+=end
 end

data/lib/qiita_org/{search_conf_path.rb → old_programs/search_conf_path.rb}

@@ -2,7 +2,7 @@ class SearchConfPath
   def initialize(dir, home)
     @dir = dir
     @home = home
-    search_conf_path()
+    #search_conf_path()
   end
 
   def search_conf_path()

data/lib/qiita_org/old_programs/select_path.rb

@@ -0,0 +1,16 @@
+class SelectPath
+  def initialize()
+  end
+
+  def select_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
+end

data/lib/qiita_org/old_programs/set_config.rb

@@ -0,0 +1,30 @@
+require "qiita_org/search_conf_path.rb"
+require "qiita_org/error_message.rb"
+
+class SetConfig
+  def initialize()
+    search = SearchConfPath.new(Dir.pwd, Dir.home)
+    @lib = File.expand_path("../../../lib", __FILE__)
+    @conf_dir = search.search_conf_path()
+    if @conf_dir != Dir.home
+      puts "config file path: #{@conf_dir.gsub(Dir.home, "~")}".green
+    else
+      puts "config file path: #{@conf_dir}"
+    end
+  end
+
+  def set_config()
+    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) #== false
+#      puts "Please setting ACCESS_TOKEN".red
+#      exit
+
+    return access_token, teams_url, display, ox_qmd_load_path
+  end
+end

data/lib/qiita_org/{show_file_and_url.rb → old_programs/show_file_and_url.rb}

@@ -1,47 +1,48 @@
 require "colorize"
 require "qiita_org/get_file_url.rb"
+require "qiita_org/set_config.rb"
+require "qiita_org/access_qiita.rb"
+require "qiita_org/file_open.rb"
+require "qiita_org/error_message.rb"
 
 class ShowFile
   def initialize(paths, src, mode, os)
     @paths = paths
     @src = src
-    @mode = (mode == "qiita" || mode == "open")? "public" : mode
+    @mode = (mode == "qiita" || mode == "open") ? "public" : mode
     @os = os
-    search = SearchConfPath.new(Dir.pwd, Dir.home)
-    @conf_dir = search.search_conf_path()
-  end
-
-  def set_config()
-    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"]
+    @fileopen = FileOpen.new(@os)
   end
 
   def open_file_dir()
     previous_paths = []
     previous_paths << File.join(@paths[0].split("/")[0..-2])
-    if @os == "mac"
-      system "open #{File.join(@paths[0].split("/")[0..-2])}"
-    elsif @os == "windows"
-      system "explorer.exe #{File.join(@paths[0].split("/")[0..-2])}"
-    else
-      system "open #{File.join(@paths[0].split("/")[0..-2])}"
-      system "xdg-open #{File.join(@paths[0].split("/")[0..-2])}"
-    end
+    @fileopen.file_open(File.join(@paths[0].split("/")[0..-2]))
+
+    #    if @os == "mac"
+    #      system "open # {File.join(@paths[0].split("/")[0..-2])}"
+    #    elsif @os == "windows"
+    #      system "explorer.exe # {File.join(@paths[0].split("/")[0..-2])}"
+    #    else
+    #      system "open # {File.join(@paths[0].split("/")[0..-2])}"
+    #      system "xdg-open # {File.join(@paths[0].split("/")[0..-2])}"
+    #    end
+
     @paths.each do |path|
       dir_path = File.join(path.split("/")[0..-2])
       unless previous_paths.include?(dir_path)
         previous_paths << dir_path
-        #system "open #{dir_path}"
-        if @os == "mac"
-          system "open #{dir_path}"
-        elsif @os == "windows"
-          system "explorer.exe #{dir_path}"
-        else
-          system "open #{dir_path}"
-          system "xdg-open #{dir_path}"
-        end
+        #system "open # {dir_path}"
+        @fileopen.file_open(dir_path)
+
+        #        if @os == "mac"
+        #          system "open # {dir_path}"
+        #        elsif @os == "windows"
+        #          system "explorer.exe # {dir_path}"
+        #        else
+        #          system "open # {dir_path}"
+        #          system "xdg-open # {dir_path}"
+        #        end
       end
     end
   end
@@ -50,21 +51,27 @@ class ShowFile
     conts = File.read(@src)
     id = conts.match(/\#\+qiita_#{@mode}: (.+)/)[1]
 
-    set_config()
+    @access_token, @teams_url, @display, @ox_qmd_load_path = SetConfig.new().set_config()
+    if @mode == "teams"
+      ErrorMessage.new().teams_url_error(@teams_url)
+    end
 
-    qiita = (@mode == "teams")? @teams_url : "https://qiita.com/"
+    qiita = (@mode == "teams") ? @teams_url : "https://qiita.com/"
     path = "api/v2/items/#{id}"
 
-    items = access_qiita(@access_token, qiita, path)
+    items = AccessQiita.new(@access_token, qiita, path).access_qiita()
 
+    @fileopen.file_open(items["url"])
+=begin
     if @os == "mac"
-      system "open #{items["url"]}"
+      system "open # {items["url"]}"
     elsif @os == "windows"
-      system "explorer.exe #{items["url"]}"
+      system "explorer.exe # {items["url"]}"
     else
-      system "open #{items["url"]}"
-      system "xdg-open #{items["url"]}"
+      system "open # {items["url"]}"
+      system "xdg-open # {items["url"]}"
     end
+=end
   end
 
   def show_file_url()
@@ -100,6 +107,7 @@ class ShowFile
     File.write(@src, lines.join)
   end
 
+=begin
   def access_qiita(access_token, qiita, path)
     uri = URI.parse(qiita + path)
 
@@ -107,10 +115,11 @@ class ShowFile
                 "Content-Type" => "application/json" }
 
     response = URI.open(
-      "#{uri}",
-      "Authorization" => "#{headers["Authorization"]}",
+      "# {uri}",
+      "Authorization" => "# {headers["Authorization"]}",
     )
     items = JSON.parse(response.read)
     return items
   end
+=end
 end

data/lib/qiita_org/post.rb

@@ -4,29 +4,24 @@ require "net/https"
 require "json"
 require "command_line/global"
 require "colorize"
-require "qiita_org/search_conf_path.rb"
 require "qiita_org/md_converter_for_image"
+require "qiita_org/error_message"
+require "qiita_org/access_qiita.rb"
 
 class QiitaPost
   def initialize(file, option, os)
     @src = file
     @option = (option == "qiita" || option == "open")? "public" : option
     @os = os
-    search = SearchConfPath.new(Dir.pwd, Dir.home)
-    @conf_dir = search.search_conf_path()
-    p @conf_dir
+    @base = QiitaBase.new
   end
 
   public
-  def get_title_tags()
-    @conts = File.read(@src)
-    m = @conts.match(/\#\+(TITLE|title|Title): (.+)/)
+  def get_title_tags(conts)
+    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
+    @tags = if m = conts.match(/\#\+(TAG|tag|Tag|tags|TAGS|Tags): (.+)/)
+              ErrorMessage.new().many_tags_error(m[2])
               m[2].split(",").inject([]) do |l, c|
                  l << { name: c.strip } #, versions: []}
               end
@@ -34,22 +29,14 @@ class QiitaPost
               [{ name: "hoge" }] #, versions: [] }]
             end
     p @tags
-  end
-
-  def set_config()
-    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"]
-    lib = File.expand_path("../../../lib", __FILE__)
-    @ox_qmd_load_path = File.join(lib, "qiita_org", "ox-qmd", "ox-qmd") # @conf["ox_qmd_load_path"]
+    return @title, @tags
   end
 
   # src.org -> src.md
   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
 
   # add source path in md
@@ -60,21 +47,47 @@ class QiitaPost
   end
 
   # patch or post selector by qiita_id
-  def select_patch_or_post()
-    m = []
-    @patch = false
-    if m = @conts.match(/\#\+qiita_#{@option}: (.+)/)
-      @qiita_id = m[1]
-      @patch = true
+  def select_patch_or_post(src, option)
+    #m = []
+    patch = false
+    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
   end
 
+  # check twitter post
+  def select_twitter(conts, option)
+    option == "public" && conts.match?(/^\#\+twitter:\s*on$/i)
+  end
+
   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
@@ -93,6 +106,7 @@ class QiitaPost
       "private": @private,
       "title": @title,
       "tags": @tags,
+      "tweet": @twitter,
     }
 
     if @patch
@@ -110,11 +124,16 @@ class QiitaPost
 
     headers = { "Authorization" => "Bearer #{@access_token}",
                 "Content-Type" => "application/json" }
+
     if @patch
-      @res = http_req.patch(uri.path, params.to_json, headers)
+      res = http_req.patch(uri.path, params.to_json, headers)
     else
-      @res = http_req.post(uri.path, params.to_json, headers)
+      res = http_req.post(uri.path, params.to_json, headers)
     end
+
+    ErrorMessage.new().qiita_post_error(res, @src.gsub(".org", ".md"))
+
+    return res
   end
 
   # qiita return
@@ -129,6 +148,9 @@ class QiitaPost
       end
       print "%20s %s\n" % [key, cont]
     end
+    #if @display == "suppress"
+    #  puts @res_body["url"].green
+    #end
   end
 
   # add qiita_id on src.org
@@ -139,30 +161,26 @@ class QiitaPost
     end
   end
 
-  # open qiita
-  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"]}"
+  def run()
+    @conts = File.read(@src)
+    @title, @tags = get_title_tags(@conts)
+    @access_token, @teams_url, @display, @ox_qmd_load_path = @base.set_config()
+
+    if @option == "teams"
+      ErrorMessage.new().teams_url_error(@teams_url)
     end
-  end
 
-  def run()
-    get_title_tags()
-    set_config()
     convert_org_to_md()
     add_source_path_in_md()
-    @lines = MdConverter.new(@lines).convert_for_image()
-    select_patch_or_post()
+    @lines = MdConverter.new().convert_for_image(@lines)
+    @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)
-    qiita_post()
+    @res = qiita_post()
     get_and_print_qiita_return()
 
-    open_qiita()
+    @base.file_open(@os, @res_body["url"]) if @display != "suppress"
 
     add_qiita_id_on_org()