qiita_org 0.1.26 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2e1fd7e38ef4598de9de359b8eb236d097369adf4d40b253f98b668447ed37c
-  data.tar.gz: d9e6d0603424081e25dfae67c412f6a9f4a03b3bfdca021fdf987ca4286bb09d
+  metadata.gz: 1439e34745f6fe0f0711b34b6f231124bb249dd2f1adfa6973686c0ea2e6d6f1
+  data.tar.gz: 6ec5897e60ca99aefce238f6208eca57fa069fb89c9dc8da349e6128c78d4cb3
 SHA512:
-  metadata.gz: 077a5547ac3bc252752583b329818a198da1738d6d667656c23959f2856bc52028a1797f1459e2ed228137f43be509c79a4f5c2ae9851ce7b9a8e3a55cc19f1d
-  data.tar.gz: ad7c58041f824bd8c750e6e09aa5fcec8a79c29c2b714bc284267474451776802f432b2136281dd3558ce5775e06b4dcd894513ef8ff3793e447a89d0778c0ae
+  metadata.gz: 5638354fdec6cb35903bab5ae2b02b9843eb7ae78355e81c35402a597f5452998c46c28352fa4269b89775c4aa003f0d215b1005a5614a25da19a7aa4df2e388
+  data.tar.gz: d904ef610f7a455fe48bc761b80aa129adeb69be7ea1ea3536cedc9d3bd3dbac7ef4dc9b96f19328519d338aab5926031daa7016945cc8940d89266c4030360b

data/.gitignore

@@ -6,6 +6,8 @@
 /pkg/
 /spec/reports/
 /tmp/
+/gems/
+/gems/*
 /doc/*
 !/doc/.keep
 

data/Gemfile.lock

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

data/lib/qiita_org.rb

@@ -73,7 +73,7 @@ module QiitaOrg
         p file = argv[0] || "README.org"
         p mode = argv[1] || DecideOption.new(file).decide_option()
 
-        qiita = UpLoad.new(file, mode, os).upload()
+        qiita = QiitaFileUpLoad.new(file, mode, os).upload()
       end
 =begin
       getpath = GetFilePath.new(file)
@@ -117,15 +117,17 @@ module QiitaOrg
     def template(*argv)
       checkos = CheckPcOs.new
       os = checkos.return_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", "post all org files in the directory"
+    desc "all [teams/public/private] [options]", "post all org files in the directory"
 
     def all(*argv)
-      mode = argv[0] || false
-      All.new(mode).run()
+      #mode = argv[0] || false
+      QiitaAll.new(argv).run()
     end
 
     desc "list [qiita/teams]", "view qiita report list"

data/lib/qiita_org/all.rb

@@ -1,14 +1,21 @@
 require "colorize"
 
-class All
-  def initialize(mode)
-    @mode = mode
+class QiitaAll
+  def initialize(argv)
+    # @mode = mode
+    check_options(argv)
     @files = Dir.glob("*.org")
     p @files
   end
 
   def run()
     @files.each do |file|
+      unless @exclude_files.empty?
+        if @exclude_files.include?(file)
+          next
+        end
+      end
+
       unless @mode
         puts file.blue
         if File.read(file).match(/#\+qiita_(.+)/)
@@ -24,4 +31,20 @@ class All
       end
     end
   end
+
+  def check_options(string)
+    ["teams", "private", "public"].each do |i|
+      if string.include?(i)
+        @mode = i
+        break
+      else
+        @mode = false
+      end
+    end
+
+    @exclude_files = []
+    if string.include?("--exclude")
+      @exclude_files = string.grep(/.org/)
+    end
+  end
 end

data/lib/qiita_org/get.rb

@@ -159,7 +159,7 @@ EOS
   end
 
   def run()
-    @access_token, @teams_url, @ox_qmd_load_path = SetConfig.new().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

data/lib/qiita_org/get_file_url.rb

@@ -12,7 +12,7 @@ class GetFileUrl
     @id = id
     @file = file
     @mode = (mode == "qiita" || mode == "open")? "public" : mode
-    @access_token, @teams_url, @ox_qmd_load_path = SetConfig.new().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

data/lib/qiita_org/get_multiple_files.rb

@@ -31,7 +31,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

@@ -5,8 +5,9 @@ require "qiita_org/search_conf_path"
 require "qiita_org/error_message.rb"
 
 class QiitaGetTemplate
-  def initialize(os)
+  def initialize(os, filename)
     @os = os
+    @filename = filename
     search = SearchConfPath.new(Dir.pwd, Dir.home)
     @conf_dir = search.search_conf_path()
     # check_write_header()
@@ -18,9 +19,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 +34,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 +45,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 +56,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 +66,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
 
@@ -116,19 +117,19 @@ class QiitaGetTemplate
   end
 
   def get_name()
-    conts = File.readlines("template.org")
+    conts = File.readlines(@filename)
     p "Type your name"
     name = STDIN.gets
     conts[3] = "#+AUTHOR: #{name}"
-    File.write("template.org", conts.join)
+    File.write(@filename, conts.join)
   end
 
   def get_email()
-    conts = File.readlines("template.org")
+    conts = File.readlines(@filename)
     p "Type your email"
     email = STDIN.gets
     conts[4] = "#+EMAIL:     (concat \"#{email.chomp}\")\n"
-    File.write("template.org", conts.join)
+    File.write(@filename, conts.join)
   end
 
   def set_name_and_email()
@@ -136,10 +137,10 @@ class QiitaGetTemplate
     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

@@ -10,7 +10,7 @@ require "qiita_org/access_qiita.rb"
 class QiitaList
   def initialize(mode)
     @mode = mode
-    @access_token, @teams_url, @ox_qmd_load_path = SetConfig.new().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

data/lib/qiita_org/post.rb

@@ -66,18 +66,7 @@ class QiitaPost
 
   # check twitter post
   def select_twitter(conts, option)
-    m = []
-    twitter = false
-    if option == "public"
-      m = conts.match(/\#\+(twitter|Twitter|TWITTER): (.+)/)
-      if m[2] == 'on' || m[2] == 'On' || m[2] == 'ON'
-        twitter = true
-      else
-        twitter = false
-      end
-    end
-    twitter
-    return twitter
+    option == "public" && conts.match?(/^\#\+twitter:\s*on$/i)
   end
 
   def select_option(option)

data/lib/qiita_org/show_file_and_url.rb

@@ -3,6 +3,7 @@ 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)
@@ -52,7 +53,7 @@ class ShowFile
 
     @access_token, @teams_url, @display, @ox_qmd_load_path = SetConfig.new().set_config()
     if @mode == "teams"
-      ErrorMassage.new().teams_url_error(@teams_url)
+      ErrorMessage.new().teams_url_error(@teams_url)
     end
 
     qiita = (@mode == "teams") ? @teams_url : "https://qiita.com/"

data/lib/qiita_org/upload.rb

@@ -2,27 +2,119 @@ 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 UpLoad
+class QiitaFileUpLoad
   def initialize(src, option, os)
     @src = src
     @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()
+    if @option == "teams"
+      ErrorMessage.new().teams_url_error(@teams_url)
+    end
   end
 
   def upload()
-    paths = GetFilePath.new(@src).get_file_path()
+    #paths = GetFilePath.new(@src).get_file_path()
+    paths = get_file_path(@src)
     unless paths.empty?
-      showfile = ShowFile.new(paths, @src, @option, @os)
-      showfile.open_file_dir()
-      showfile.open_qiita()
+      #showfile = ShowFile.new(paths, @src, @option, @os)
+      #showfile.open_file_dir()
+      open_file_dir(paths)
+      #showfile.open_qiita()
+      open_qiita()
 
       puts "Overwrite file URL's on #{@src}? (y/n)".green
       ans = STDIN.getch
 
       if ans == "y"
-        showfile.input_url_to_org()
+        #showfile.input_url_to_org()
+        input_url_to_org(paths)
+      end
+    else
+      puts "file path is empty.".red
+    end
+  end
+
+  def get_file_path(src)
+    lines = File.readlines(src)
+    files = []
+    lines.each do |line|
+      if path = line.match(/\[\[(.+)\]\[file:(.+)\]\]/) || line.match(/\[\[file:(.+)\]\]/)
+        if path[2] == nil
+          files << path[1]
+        else
+          files << path[2]
+        end
+      end
+    end
+
+    return files
+  end
+
+  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]))
+
+    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)
+      end
+    end
+  end
+
+  def open_qiita()
+    conts = File.read(@src)
+    id = conts.match(/\#\+qiita_#{@option}: (.+)/)[1]
+
+=begin
+    @access_token, @teams_url, @display, @ox_qmd_load_path = SetConfig.new().set_config()
+    if @option == "teams"
+      ErrorMassage.new().teams_url_error(@teams_url)
+    end
+=end
+
+    qiita = (@option == "teams") ? @teams_url : "https://qiita.com/"
+    path = "api/v2/items/#{id}"
+
+    @access = AccessQiita.new(@access_token, qiita, path)
+    items = @access.access_qiita()
+
+    @fileopen.file_open(items["url"])
+  end
+
+  def input_url_to_org(paths)
+    lines = File.readlines(@src)
+    conts = File.read(@src)
+    id = conts.match(/\#\+qiita_#{@option}: (.+)/)[1]
+
+    paths.each do |path|
+      file_name = File.basename(path).strip
+      url = get_file_url(id, file_name)
+      lines.each_with_index do |line, i|
+        if line.match(/\[\[file:#{path}\]\]/)
+          lines[i] = "[[#{url}][file:#{path}]]\n"
+        end
       end
     end
+
+    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()
+
+    file_url = items["body"].match(/\!\[#{file_name}\]\(((.+))\)/)[2]
+    return file_url
   end
 end

data/lib/qiita_org/version.rb

@@ -1,3 +1,3 @@
 module QiitaOrg
-  VERSION = "0.1.26"
+  VERSION = "0.1.31"
 end

data/tests/test2.org

@@ -1,3 +1,4 @@
+#+qiita_teams: 7e95d62ebdbedd022256
 #+qiita_private: 6ce39fa8ae7f7a472cf2
 #+OPTIONS: ^:{}
 #+STARTUP: indent nolineimages

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qiita_org
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.1.31
 platform: ruby
 authors:
 - Kenta Yamamoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-18 00:00:00.000000000 Z
+date: 2020-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler