qiita_org 0.1.25 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bec18f10d67c5b4e15954e7a65d522a5f8589685eb46c84be8d6290907e2f3d8
-  data.tar.gz: 2493eeaa0feeab8f860452fb0e319af3aa62253aa6263f23bf0e1325f0834e95
+  metadata.gz: 0f288634b1ce2de7e2a34ddc3fd7399cdb2a1b9e63e6d4b2523ec7cf3fc84601
+  data.tar.gz: a08fb2191f4e6cc80e3c40701df53bae8ae983cfaa225dfba57ede608d846c97
 SHA512:
-  metadata.gz: 252c5def2f9fa174a3f5f169126c514d93988254b1359d5751ee0dc2e0daebdac147df440463c5ce5854e7c2c493f8f288b5cb528659e78e4db59335c046862f
-  data.tar.gz: dd92e34ea3e7277c1bda082d1ab61e3a73850aae660271691c357094b96d32714347a3a30180411ec7c0dc606c79535a7bbb1d32f1f324c0243b36f5498a0152
+  metadata.gz: 0d01c3f1937f7033f7e4a7e2989492251bc53e18e1717ba394a0385afefc217df08a756c61a3cb580e24139199de80ef065d34019d122f00443359879b3cc865
+  data.tar.gz: afd6c322d5d5de441b55b5784e630ca9c401b5f028ce7636d68a8b12dfec8a3b0feb07dd8d458043077e1d3130a65a617f946784be87266a8044c26db18595b7

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.24)
+    qiita_org (0.1.29)
       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 = QiitaUpLoad.new(file, mode, os).upload()
       end
 =begin
       getpath = GetFilePath.new(file)
@@ -121,11 +121,11 @@ module QiitaOrg
       template = QiitaGetTemplate.new(os).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/.qiita.conf

@@ -3,5 +3,6 @@
   "email": "",
   "access_token": "",
   "teams_url": "",
+  "display": "open",
   "ox_qmd_load_path": "~/.emacs.d/site_lisp/ox-qmd"
 }

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/config.json

@@ -3,5 +3,6 @@
     "email": "",
     "access_token": "",
     "teams_url": "",
+    "display": "open",
     "ox_qmd_load_path": "~/.emacs.d/site_lisp/ox-qmd"
 }

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/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)
@@ -144,6 +133,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
@@ -171,7 +163,7 @@ class QiitaPost
   def run()
     @conts = File.read(@src)
     @title, @tags = get_title_tags(@conts)
-    @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 @option == "teams"
       ErrorMessage.new().teams_url_error(@teams_url)
@@ -187,7 +179,7 @@ class QiitaPost
     get_and_print_qiita_return()
 
     #open_qiita()
-    FileOpen.new(@os).file_open(@res_body["url"])
+    FileOpen.new(@os).file_open(@res_body["url"]) if @display != "suppress"
 
     add_qiita_id_on_org()
 

data/lib/qiita_org/set_config.rb

@@ -18,12 +18,13 @@ class SetConfig
     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, ox_qmd_load_path
+    return access_token, teams_url, display, ox_qmd_load_path
   end
 end

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)
@@ -50,9 +51,9 @@ class ShowFile
     conts = File.read(@src)
     id = conts.match(/\#\+qiita_#{@mode}: (.+)/)[1]
 
-    @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"
-      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,20 +2,25 @@ 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 QiitaUpLoad
   def initialize(src, option, os)
     @src = src
     @option = (option == "qiita" || option == "open")? "public" : option
     @os = os
+    @fileopen = FileOpen.new(@os)
   end
 
   def upload()
     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.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
@@ -23,6 +28,73 @@ class UpLoad
       if ans == "y"
         showfile.input_url_to_org()
       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]
+
+    @access_token, @teams_url, @display, @ox_qmd_load_path = SetConfig.new().set_config()
+    if @option == "teams"
+      ErrorMassage.new().teams_url_error(@teams_url)
+    end
+
+    qiita = (@option == "teams") ? @teams_url : "https://qiita.com/"
+    path = "api/v2/items/#{id}"
+
+    items = AccessQiita.new(@access_token, qiita, path).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
 end

data/lib/qiita_org/version.rb

@@ -1,3 +1,3 @@
 module QiitaOrg
-  VERSION = "0.1.25"
+  VERSION = "0.1.30"
 end

data/tests/template.org

@@ -0,0 +1,14 @@
+#+qiita_private: baededc5aa906407da33
+#+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
+#+TWITTER: off
+# +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) 

data/tests/test.org

@@ -1,4 +1,4 @@
-#+qiita_private: d786bc76ea7a4ad09fb0
+#+qiita_private: e87e38157a72b4c2e839
 # +qiita_private: 5f8c73e8007e52ef3f40
 # +qiita_private: 4decbf7a81ef2327643f
 #+OPTIONS: ^:{}

data/tests/test2.org

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

data/tests/twitter_test.org

@@ -1,3 +1,4 @@
+#+qiita_private: c42df227a81e18c05b9d
 #+OPTIONS: ^:{}
 #+STARTUP: indent nolineimages
 #+TITLE: title

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qiita_org
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.30
 platform: ruby
 authors:
 - Kenta Yamamoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-17 00:00:00.000000000 Z
+date: 2020-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -2583,6 +2583,7 @@ files:
 - lib/qiita_org/version.rb
 - qiita_org.gemspec
 - tests/hoge.rb
+- tests/template.org
 - tests/test.html
 - tests/test.org
 - tests/test2.org