qiita_org 0.1.31 → 0.1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1439e34745f6fe0f0711b34b6f231124bb249dd2f1adfa6973686c0ea2e6d6f1
-  data.tar.gz: 6ec5897e60ca99aefce238f6208eca57fa069fb89c9dc8da349e6128c78d4cb3
+  metadata.gz: 3065c27fab3f91eef0df4ddb3f966fcddb54cebc741450e71977f0fd7f0d5961
+  data.tar.gz: 892613248797cf2f82497e6b355b7fa9e4fc05b48b9fc823d32516f05efbe03c
 SHA512:
-  metadata.gz: 5638354fdec6cb35903bab5ae2b02b9843eb7ae78355e81c35402a597f5452998c46c28352fa4269b89775c4aa003f0d215b1005a5614a25da19a7aa4df2e388
-  data.tar.gz: d904ef610f7a455fe48bc761b80aa129adeb69be7ea1ea3536cedc9d3bd3dbac7ef4dc9b96f19328519d338aab5926031daa7016945cc8940d89266c4030360b
+  metadata.gz: 7005e750de0160ac668c0742c64d380e5898a26c7f0d1f56a4f09b901b52ea933902ea611478685ced7871724e47bbc3704342809f73bb129772bbb483eb1594
+  data.tar.gz: 59ad6b10fcc271bb2e11377963c4d5cde04ec3d7397642a1981eab81f17b5b40f95ebbe6099932f88172dbb953227420fbc7bfca368dad76245cc989c97bb44b

data/Gemfile.lock

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

data/lib/qiita_org.rb

@@ -9,12 +9,13 @@ 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/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_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
@@ -25,6 +26,7 @@ module QiitaOrg
     #
     def initialize(*argv)
       super(*argv)
+      @base = QiitaBase.new()
     end
 
     desc "say_hello", "say_hello"
@@ -37,17 +39,21 @@ module QiitaOrg
     desc "post [FILE] [private/public/teams]", "post to qiita from org"
 
     def post(*argv)
-      checkos = CheckPcOs.new
-      os = checkos.return_os()
+      #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()
+      elsif 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] || 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)
@@ -62,35 +68,23 @@ module QiitaOrg
     desc "upload [FILE] [teams/public/private]", "upload about image to qiita"
 
     def upload(*argv)
-      checkos = CheckPcOs.new
-      os = checkos.return_os()
+      #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()
+      elsif 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] || DecideOption.new(file).decide_option()
+        p mode = argv[1] || @base.pick_up_option(file)
 
         qiita = QiitaFileUpLoad.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()
-        end
-      end
-=end
     end
 
     desc "config [global/local] [option] [input]", "set config"
@@ -115,8 +109,9 @@ module QiitaOrg
     desc "template", "make template.org"
 
     def template(*argv)
-      checkos = CheckPcOs.new
-      os = checkos.return_os()
+      #checkos = CheckPcOs.new
+      #os = checkos.return_os()
+      os = @base.check_pc_os()
       filename = argv[0] || "template.org"
       filename = (filename.include?(".org"))? filename : "#{filename}.org"
 

data/lib/qiita_org/base.rb

@@ -0,0 +1,78 @@
+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
+end

data/lib/qiita_org/config.rb

@@ -7,8 +7,9 @@ class QiitaConfig
     @option = option
     @input = input
     if status == "local"
-      search = SearchConfPath.new(Dir.pwd, Dir.home)
-      conf_dir = search.search_conf_path()
+      #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/get.rb

@@ -3,8 +3,8 @@ 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/select_path.rb"
+#require "qiita_org/set_config.rb"
 require "qiita_org/error_message.rb"
 require "qiita_org/access_qiita.rb"
 
@@ -12,47 +12,10 @@ class QiitaGet
   def initialize(mode, id)
     @mode = mode
     @get_id = id
-    @selectpath = SelectPath.new()
+    @base = QiitaBase.new()
+    # @selectpath = SelectPath.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|
@@ -159,13 +122,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

@@ -2,7 +2,7 @@ require "colorize"
 #require "../qiita_org/qiita_org.rb"
 require "qiita_org/post.rb"
 require "qiita_org/upload.rb"
-require "qiita_org/decide_option.rb"
+#require "qiita_org/decide_option.rb"
 
 class GetMultipleFiles
   def initialize(files, os, type)
@@ -19,7 +19,8 @@ class GetMultipleFiles
   def run()
     puts "post files: #{@files}".green
     @files.each do |file|
-      mode = @option || DecideOption.new(file).decide_option()
+      #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)

data/lib/qiita_org/get_template.rb

@@ -1,15 +1,16 @@
 require "fileutils"
 require "colorize"
 require "kconv"
-require "qiita_org/search_conf_path"
+#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()
+    #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
 
@@ -116,6 +117,7 @@ class QiitaGetTemplate
     end
   end
 
+=begin
   def get_name()
     conts = File.readlines(@filename)
     p "Type your name"
@@ -131,6 +133,7 @@ class QiitaGetTemplate
     conts[4] = "#+EMAIL:     (concat \"#{email.chomp}\")\n"
     File.write(@filename, conts.join)
   end
+=end
 
   def set_name_and_email()
     conf_path = File.join(@conf_dir, ".qiita.conf")

data/lib/qiita_org/list.rb

@@ -2,54 +2,27 @@ 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/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 = 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 = 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"]}"

data/lib/qiita_org/post.rb

@@ -5,15 +5,17 @@ require "json"
 require "command_line/global"
 require "colorize"
 require "qiita_org/md_converter_for_image"
-require "qiita_org/set_config.rb"
+#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
@@ -64,6 +66,26 @@ class QiitaPost
     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
+      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)
@@ -146,24 +168,11 @@ 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 = 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)
@@ -173,6 +182,7 @@ class QiitaPost
     add_source_path_in_md()
     @lines = MdConverter.new().convert_for_image(@lines)
     @qiita_id, @patch = select_patch_or_post(@conts, @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()

data/lib/qiita_org/upload.rb

@@ -1,9 +1,9 @@
 require "colorize"
 require "io/console"
-require "qiita_org/get_file_path.rb"
-require "qiita_org/show_file_and_url.rb"
+#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/set_config.rb"
 require "qiita_org/access_qiita.rb"
 
 class QiitaFileUpLoad
@@ -12,7 +12,8 @@ class QiitaFileUpLoad
     @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()
+    # @access_token, @teams_url, @display, @ox_qmd_load_path = SetConfig.new().set_config()
+    @access_token, @teams_url, @display, @ox_qmd_load_path = QiitaBase.new().set_config()
     if @option == "teams"
       ErrorMessage.new().teams_url_error(@teams_url)
     end
@@ -97,7 +98,7 @@ class QiitaFileUpLoad
 
     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
       lines.each_with_index do |line, i|
         if line.match(/\[\[file:#{path}\]\]/)
           lines[i] = "[[#{url}][file:#{path}]]\n"
@@ -114,7 +115,13 @@ class QiitaFileUpLoad
 
     items = @access.access_qiita()
 
-    file_url = items["body"].match(/\!\[#{file_name}\]\(((.+))\)/)[2]
-    return file_url
+    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.31"
+  VERSION = "0.1.32"
 end

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.31
+  version: 0.1.32
 platform: ruby
 authors:
 - Kenta Yamamoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-01 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -2558,26 +2558,27 @@ 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/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