qiita_org 0.1.18 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8708c6f135460251aa901f1ce1b3286e394d9332c414e6d35b3feae4016975c
-  data.tar.gz: 63994fbdfc556b5066770049fa6bbdaf9301b31b496710d208f9af290376047e
+  metadata.gz: beffdb8ca4472a742773b3f18ef4358be70621d887be94f0cc4d7db4bf703f4e
+  data.tar.gz: a9f1c37a7511ec9ed355c39f587511e96dac790b3be07198b54182f8ad94782b
 SHA512:
-  metadata.gz: 06c982205c61c738d41cb8565d57d57fae263f88dff42aa5b49922f2c2c09dc185351e7f395ac8ac3e333adabfdb69c45e25a9437c495d706bfd21dbdd41addb
-  data.tar.gz: 2d7d912629d23f58b9cd97244ff823a036e4110d31e51bde7b4ed17ca1fc95b71f74b04bb3db7f28a54a7824e70e674c0a169b8b6903aee7eb01f87fbdf32910
+  metadata.gz: 9b5a5ae877e5c0329f15285cc5de0e9382b485204825e4ecdd3a2c6234e9ee9c9b3bc108f867743ee8795672e8ae302085073e32455f600aee9be71b0c627195
+  data.tar.gz: cdba09e7aee71b7c21b6897e6131bad6013213abc91a407a5a6f0ce2d34125e1331755d7c7935fa5de11168c97e2674200370bb7bb0dfb99b9601052001ed690

data/Gemfile.lock

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

data/lib/qiita_org.rb

@@ -9,8 +9,10 @@ require "qiita_org/get"
 require "qiita_org/list"
 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/qiita_org_thor"
 
 module QiitaOrg
@@ -38,7 +40,7 @@ module QiitaOrg
 
       p ["in qiita_org.rb", argv]
       p file = argv[0] || "README.org"
-      p mode = argv[1] || "private"
+      p mode = argv[1] || DecideOption.new(file).decide_option()
       qiita = QiitaPost.new(file, mode, os)
       begin
         qiita.select_option(mode)
@@ -56,8 +58,10 @@ module QiitaOrg
       os = checkos.return_os()
 
       p file = argv[0] || "README.org"
-      p mode = argv[1] || "private"
+      p mode = argv[1] || DecideOption.new(file).decide_option()
 
+      UpLoad.new(file, mode, os).upload()
+=begin
       getpath = GetFilePath.new(file)
       paths = getpath.get_file_path()
       unless paths.empty?
@@ -72,6 +76,7 @@ module QiitaOrg
           showfile.input_url_to_org()
         end
       end
+=end
     end
 
     desc "config [global/local] [option] [input]", "set config"
@@ -99,10 +104,10 @@ module QiitaOrg
       checkos = CheckPcOs.new
       os = checkos.return_os()
 
-      template = QiitaGetTemplate.new(os)
+      template = QiitaGetTemplate.new(os).run()
     end
 
-    desc "all", "post all org file in the directory"
+    desc "all", "post all org files in the directory"
 
     def all(*argv)
       Dir.glob("*.org").each do |org|

data/lib/qiita_org/.qiita.conf

@@ -1,7 +1,7 @@
 {
-    "name": "",
-    "email": "",
-    "access_token": "",
-    "teams_url": "",
-    "ox_qmd_load_path": "~/.emacs.d/site_lisp/ox-qmd"
-}
+  "name": "",
+  "email": "",
+  "access_token": "",
+  "teams_url": "",
+  "ox_qmd_load_path": "~/.emacs.d/site_lisp/ox-qmd"
+}

data/lib/qiita_org/access_qiita.rb

@@ -0,0 +1,31 @@
+require "colorize"
+require "qiita_org/error_message.rb"
+
+class AccessQiita
+  def initialize(access_token, qiita, path)
+    @access_token = access_token
+    @qiita = qiita
+    @path = path
+  end
+
+  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"]}",
+                          )
+    rescue => e
+      #puts "#{$!}".red
+      #exit
+      ErrorMessage.new().qiita_access_error(e)
+    else
+      items = JSON.parse(response.read)
+      return items
+    end
+  end
+end

data/lib/qiita_org/decide_option.rb

@@ -0,0 +1,26 @@
+class DecideOption
+  def initialize(src)
+    @src = src
+  end
+
+  def decide_option()
+    lines = File.readlines(@src)
+
+    lines.each do |line|
+      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
+    option = "private"
+    return option
+  end
+end
+
+if __FILE__ == $0
+  DecideOption.new("test.org").decide_option()
+end

data/lib/qiita_org/error_message.rb

@@ -0,0 +1,90 @@
+require "colorize"
+require "json"
+
+class ErrorMessage
+  def initialize()
+  end
+
+  def access_token_error(access_token)
+    if access_token == ""
+      puts "Please setting ACCESS_TOKEN".red
+      exit
+    end
+  end
+
+  def teams_url_error(teams_url)
+    if teams_url == ""
+      puts "Please setting teams_url".red
+      exit
+    end
+  end
+
+  def qiita_access_error(e)
+    puts "#{$!}".red
+    exit
+  end
+
+  def qiita_post_error(response)
+    message = response.message
+    if message != "Created"
+      if message != "OK"
+        if message == "Unauthorized"
+          puts "#{message}".red
+          puts "Please check your access_token.".red
+          exit
+      elsif message == "Forbidden"
+          puts "#{message}".red
+          puts "You are not authorized to access this page. please check qiita_id.".red
+          exit
+        elsif message == "Not Found"
+        puts "#{message}".red
+          exit
+        else
+          puts "#{message}".red
+          exit
+        end
+      end
+    end
+  end
+  
+  def config_set_error(conf_dir)
+    conf_path = File.join(conf_dir, ".qiita.conf")
+    conf = JSON.load(File.read(conf_path))
+    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
+#      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
+      check = false
+    end
+    unless check
+      exit
+    end
+  end
+
+  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
+      exit
+    else
+      p res
+    end
+  end
+
+  def many_tags_error(tags)
+    if tags.count(",") >= 5
+      puts "The maximum number of tag is five. Please delete some tags.".red
+      exit
+    end
+  end
+end

data/lib/qiita_org/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.rb

@@ -3,49 +3,55 @@ require "json"
 require "open-uri"
 require "io/console"
 require "colorize"
-require "qiita_org/search_conf_path.rb"
+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 QiitaGet
   def initialize(mode, id)
     @mode = mode
     @get_id = id
-    search = SearchConfPath.new(Dir.pwd, Dir.home)
-    @conf_dir = search.search_conf_path()
-  end
-
-  # set config
-  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"]
+    @selectpath = SelectPath.new()
   end
 
   # select path
-  def select_path()
-    case @mode
+=begin
+  def select_path(mode)
+    case mode
     when "teams"
-      @qiita = @teams_url
-      @path = "api/v2/items?page=1&per_page=100"
+      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"
+      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}",
+    headers = { "Authorization" => "Bearer # {@access_token}",
       "Content-Type" => "application/json" }
 
-    response = URI.open(
-                        "#{uri}",
-                        "Authorization" => "#{headers["Authorization"]}",
-                        )
-    @items = JSON.parse(response.read)
+    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()
@@ -121,7 +127,7 @@ EOS
   # see massage and delete id.md
   def puts_massage_and_delete_md()
     puts "created #{@id}.org".green
-    puts "URL: #{@items["url"]}".green
+    puts "URL: #{@items["url"]}"
     system "rm -f #{@id}.md"
   end
 
@@ -134,7 +140,8 @@ EOS
     end
     @path = "api/v2/items/#{@get_id}"
 
-    access_qiita()
+    @items = AccessQiita.new(@access_token, @qiita, @path).access_qiita()
+    #access_qiita()
 
     @title = @items["title"]
     @id = @items["id"]
@@ -152,10 +159,14 @@ EOS
   end
 
   def run()
-    set_config()
+    @access_token, @teams_url, @ox_qmd_load_path = SetConfig.new().set_config()
+    if @mode == "teams"
+      ErrorMessage.new().teams_url_error(@teams_url)
+    end
+
     if @get_id == nil
-      select_path()
-      access_qiita()
+      @qiita, @path = @selectpath.select_path(@mode)
+      @items = AccessQiita.new(@access_token, @qiita, @path).access_qiita()
       select_report()
     else
       get_id_report()

data/lib/qiita_org/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, @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/get_template.rb

@@ -2,16 +2,14 @@ require "fileutils"
 require "colorize"
 require "kconv"
 require "qiita_org/search_conf_path"
+require "qiita_org/error_message.rb"
 
 class QiitaGetTemplate
   def initialize(os)
     @os = os
-    cp_template()
     search = SearchConfPath.new(Dir.pwd, Dir.home)
     @conf_dir = search.search_conf_path()
-    set_name_and_email()
     # check_write_header()
-    check_write_contents()
   end
 
   def get_macos_version()
@@ -143,4 +141,11 @@ class QiitaGetTemplate
     conts[4] = "#+EMAIL:     (concat \"#{email}\")\n"
     File.write("template.org", conts.join)
   end
+
+  def run()
+    ErrorMessage.new().config_set_error(@conf_dir)
+    cp_template()
+    set_name_and_email()
+    check_write_contents()
+  end
 end

data/lib/qiita_org/list.rb

@@ -2,27 +2,26 @@ require "net/https"
 require "json"
 require "open-uri"
 require "colorize"
-require "qiita_org/search_conf_path.rb"
+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
-    search = SearchConfPath.new(Dir.pwd, Dir.home)
-    @conf_dir = search.search_conf_path()
-    set_config()
-    select_path()
-    access_qiita()
-    view_list()
-  end
+    @access_token, @teams_url, @ox_qmd_load_path = SetConfig.new().set_config()
+    if @mode == "teams"
+      ErrorMessage.new().teams_url_error(@teams_url)
+    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"]
+    @qiita, @path = SelectPath.new().select_path(@mode)
+    @items = AccessQiita.new(@access_token, @qiita, @path).access_qiita()
+    view_list()
   end
 
   # select path
+=begin
   def select_path()
     case @mode
     when "teams"
@@ -33,20 +32,23 @@ class QiitaList
       @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}",
+    headers = { "Authorization" => "Bearer # {@access_token}",
       "Content-Type" => "application/json" }
 
     response = URI.open(
-                        "#{uri}",
-                        "Authorization" => "#{headers["Authorization"]}",
+                        "# {uri}",
+                        "Authorization" => "# {headers["Authorization"]}",
                         )
     @items = JSON.parse(response.read)
   end
+=end
 
   def view_list()
     @items.each do |item|

data/lib/qiita_org/md_converter_for_image.rb

@@ -1,25 +1,25 @@
 class MdConverter
-  def initialize(lines)
-    @lines = lines
+  def initialize()
+    # @lines = lines
   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/post.rb

@@ -4,29 +4,28 @@ 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/set_config.rb"
+require "qiita_org/error_message"
+require "qiita_org/file_open.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
   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): (.+)/)
+              #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: []}
               end
@@ -34,22 +33,15 @@ 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
+    #p res
+    ErrorMessage.new().md_file_exists?(@src, res)
   end
 
   # add source path in md
@@ -60,15 +52,16 @@ class QiitaPost
   end
 
   # patch or post selector by qiita_id
-  def select_patch_or_post()
+  def select_patch_or_post(conts, option)
     m = []
-    @patch = false
-    if m = @conts.match(/\#\+qiita_#{@option}: (.+)/)
-      @qiita_id = m[1]
-      @patch = true
+    patch = false
+    if m = conts.match(/\#\+qiita_#{option}: (.+)/)
+      qiita_id = m[1]
+      patch = true
     else
-      @qiita_id = ""
+      qiita_id = ""
     end
+    return qiita_id, patch
   end
 
   def select_option(option)
@@ -110,11 +103,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)
+
+    return res
   end
 
   # qiita return
@@ -140,31 +138,42 @@ class QiitaPost
   end
 
   # open qiita
+=begin
   def open_qiita()
     if @os == "mac"
-      system "open #{@res_body["url"]}"
+      system "open # {@res_body["url"]}"
     elsif @os == "windows"
-      system "explorer.exe #{@res_body["url"]}"
+      system "explorer.exe # {@res_body["url"]}"
     else
-      system "open #{@res_body["url"]}"
-      system "xdg-open #{@res_body["url"]}"
+      system "open # {@res_body["url"]}"
+      system "xdg-open # {@res_body["url"]}"
     end
   end
+=end
 
   def run()
-    get_title_tags()
-    set_config()
+    @conts = File.read(@src)
+    @title, @tags = get_title_tags(@conts)
+    @access_token, @teams_url, @ox_qmd_load_path = SetConfig.new().set_config()
+
+    if @option == "teams"
+      ErrorMessage.new().teams_url_error(@teams_url)
+    end
+
     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(@conts, @option)
     @qiita, @private = select_option(@option)
-    qiita_post()
+    @res = qiita_post()
     get_and_print_qiita_return()
 
-    open_qiita()
+    #open_qiita()
+    FileOpen.new(@os).file_open(@res_body["url"])
 
     add_qiita_id_on_org()
+
+    system "rm #{@src.gsub(".org", ".md")}"
   end
 end
 

data/lib/qiita_org/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/select_path.rb

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

data/lib/qiita_org/set_config.rb

@@ -0,0 +1,29 @@
+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"]
+    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, ox_qmd_load_path
+  end
+end

data/lib/qiita_org/show_file_and_url.rb

@@ -1,47 +1,47 @@
 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"
 
 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 +50,27 @@ class ShowFile
     conts = File.read(@src)
     id = conts.match(/\#\+qiita_#{@mode}: (.+)/)[1]
 
-    set_config()
+    @access_token, @teams_url, @ox_qmd_load_path = SetConfig.new().set_config()
+    if @mode == "teams"
+      ErrorMassage.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 +106,7 @@ class ShowFile
     File.write(@src, lines.join)
   end
 
+=begin
   def access_qiita(access_token, qiita, path)
     uri = URI.parse(qiita + path)
 
@@ -107,10 +114,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/upload.rb

@@ -0,0 +1,28 @@
+require "colorize"
+require "io/console"
+require "qiita_org/get_file_path.rb"
+require "qiita_org/show_file_and_url.rb"
+
+class UpLoad
+  def initialize(src, option, os)
+    @src = src
+    @option = (option == "qiita" || option == "open")? "public" : option
+    @os = os
+  end
+
+  def upload()
+    paths = GetFilePath.new(@src).get_file_path()
+    unless paths.empty?
+      showfile = ShowFile.new(paths, @src, @option, @os)
+      showfile.open_file_dir()
+      showfile.open_qiita()
+
+      puts "Overwrite file URL's on #{@src}? (y/n)".green
+      ans = STDIN.getch
+
+      if ans == "y"
+        showfile.input_url_to_org()
+      end
+    end
+  end
+end

data/lib/qiita_org/version.rb

@@ -1,3 +1,3 @@
 module QiitaOrg
-  VERSION = "0.1.18"
+  VERSION = "0.1.23"
 end

data/tests/test.org

@@ -1,18 +1,21 @@
-#+qiita_private: 5f8c73e8007e52ef3f40
+# +qiita_private: 5f8c73e8007e52ef3f40
+# +qiita_private: 4decbf7a81ef2327643f
 #+OPTIONS: ^:{}
 #+STARTUP: indent nolineimages
 #+TITLE: test
 #+AUTHOR: Kenta Yamamoto
 #+EMAIL:     (concat "doi35077@kwansei.ac.jp")
+#+qiita_id: yamatoken
 #+LANGUAGE:  jp
 # +OPTIONS:   H:4 toc:t num:2
 #+OPTIONS:   toc:nil
-#+TAG: test
+#+TAG: test1, test2, test3, test4, test5
 # +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) 
 
-fogefoge
+| fogefoge | fogefoge |
+| foge     | foge     |
 # +caption: example qiita template command
 # +name: fig:fig1
 #+ATTR_LATEX: :width 8cm
@@ -24,3 +27,5 @@ fogefoge
 [[file:../figs/fig2.png]]
 
 https://qiita-image-store.s3.ap-northeast-1.amazonaws.com/0/612049/a3b2ab02-f903-f5d6-d8b9-5407e8db5a2a.png
+
+

data/tests/test2.org

@@ -18,4 +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]]
 
+[[file:../figs/fig1.png]]
+
 

data/tests/test3.org

@@ -0,0 +1,15 @@
+#+qiita_teams: bd41ced53b4b18701453
+#+OPTIONS: ^:{}
+#+STARTUP: indent nolineimages
+#+TITLE: test
+#+AUTHOR: Kenta Yamamoto
+#+EMAIL:     (concat "doi35077@kwansei.ac.jp")
+#+LANGUAGE:  jp
+# +OPTIONS:   H:4 toc:t num:2
+#+OPTIONS:   toc:nil
+#+TAG: test
+# +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) 
+
+fogefoge

data/tests/test4.org

@@ -0,0 +1,15 @@
+#+qiita_private: 92b50b88e7da7aa25a1b
+#+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
+# +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) 
+
+[[https://qiita-image-store.s3.ap-northeast-1.amazonaws.com/0/612049/d0531ab8-57b7-7289-7e4f-75c9f54a45d3.png][file:../figs/fig1.png]]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qiita_org
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.23
 platform: ruby
 authors:
 - Kenta Yamamoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2020-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -957,9 +957,13 @@ files:
 - gems/ruby/2.7.0/specifications/thor-1.0.1.gemspec
 - lib/qiita_org.rb
 - lib/qiita_org/.qiita.conf
+- lib/qiita_org/access_qiita.rb
 - lib/qiita_org/check_pc_os.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
@@ -970,16 +974,20 @@ files:
 - 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/test.html
-- tests/test.md
 - tests/test.org
 - tests/test2.md
 - tests/test2.org
+- tests/test3.org
+- tests/test4.org
 homepage: https://github.com/yamatoken/qiita_org
 licenses:
 - MIT

data/tests/test.md

@@ -1,10 +0,0 @@
-\![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>) 
-
-fogefoge
-
-[![img](https://qiita-image-store.s3.ap-northeast-1.amazonaws.com/0/612049/a3b2ab02-f903-f5d6-d8b9-5407e8db5a2a.png)](file:///Users/kentayamamoto/Github/qiita_org/figs/fig1.png)
-
-![img](../figs/fig2.png "example qiita template command")
-
-![img](https://qiita-image-store.s3.ap-northeast-1.amazonaws.com/0/612049/a3b2ab02-f903-f5d6-d8b9-5407e8db5a2a.png)
-