qiita_org 0.1.31 → 0.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1439e34745f6fe0f0711b34b6f231124bb249dd2f1adfa6973686c0ea2e6d6f1
-  data.tar.gz: 6ec5897e60ca99aefce238f6208eca57fa069fb89c9dc8da349e6128c78d4cb3
+  metadata.gz: 85fee93ef259f2a003f0c2a56c65ba781ac7db53e5cf04110f488b904c991a60
+  data.tar.gz: 7398bb96ffa87c138f8ee2a57ade4ac33482873fd4e341a3ad08421e29261101
 SHA512:
-  metadata.gz: 5638354fdec6cb35903bab5ae2b02b9843eb7ae78355e81c35402a597f5452998c46c28352fa4269b89775c4aa003f0d215b1005a5614a25da19a7aa4df2e388
-  data.tar.gz: d904ef610f7a455fe48bc761b80aa129adeb69be7ea1ea3536cedc9d3bd3dbac7ef4dc9b96f19328519d338aab5926031daa7016945cc8940d89266c4030360b
+  metadata.gz: bf622ca31fb89a327f5a3d9775ba6e4ccd9b740baec5c0ef4e435bde87313c457ba2bab5f5e18884c2d96744830793122cc54979cea57dc02fc1355df8c98018
+  data.tar.gz: b0db0231db4ed73fc41e495befb52865fe91c06c914f8362ecc8a374754ab35fa7bd887d842dbb7a539641259706e9567d9a851f945538825c1ddd6b5a03af14

data/.gitignore

@@ -7,8 +7,6 @@
 /spec/reports/
 /tmp/
 /gems/
-/gems/*
-/doc/*
 !/doc/.keep
 
 # rspec failure tracking

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qiita_org (0.1.30)
+    qiita_org (0.1.36)
       colorize
       command_line (> 2.0.0)
       fileutils
@@ -14,7 +14,7 @@ GEM
     colorize (0.8.1)
     command_line (2.0.1)
     diff-lcs (1.4.4)
-    ffi (1.13.1)
+    ffi (1.14.2)
     fileutils (1.4.1)
     formatador (0.2.5)
     guard (2.16.2)
@@ -29,7 +29,7 @@ GEM
     guard-yard (2.2.1)
       guard (>= 1.1.0)
       yard (>= 0.7.0)
-    listen (3.3.1)
+    listen (3.3.3)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
@@ -45,20 +45,20 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    redcarpet (3.5.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    redcarpet (3.5.1)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
     shellany (0.0.1)
     thor (1.0.1)
     yard (0.9.25)

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 = 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()
+          qiita = QiitaFileUpLoad.new(file, mode, os).upload()
         end
       end
-=end
     end
 
     desc "config [global/local] [option] [input]", "set config"
@@ -115,8 +94,7 @@ 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"
 
@@ -126,7 +104,6 @@ module QiitaOrg
     desc "all [teams/public/private] [options]", "post all org files in the directory"
 
     def all(*argv)
-      #mode = argv[0] || false
       QiitaAll.new(argv).run()
     end
 

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