qiita_org 0.1.30 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f288634b1ce2de7e2a34ddc3fd7399cdb2a1b9e63e6d4b2523ec7cf3fc84601
-  data.tar.gz: a08fb2191f4e6cc80e3c40701df53bae8ae983cfaa225dfba57ede608d846c97
+  metadata.gz: 1439e34745f6fe0f0711b34b6f231124bb249dd2f1adfa6973686c0ea2e6d6f1
+  data.tar.gz: 6ec5897e60ca99aefce238f6208eca57fa069fb89c9dc8da349e6128c78d4cb3
 SHA512:
-  metadata.gz: 0d01c3f1937f7033f7e4a7e2989492251bc53e18e1717ba394a0385afefc217df08a756c61a3cb580e24139199de80ef065d34019d122f00443359879b3cc865
-  data.tar.gz: afd6c322d5d5de441b55b5784e630ca9c401b5f028ce7636d68a8b12dfec8a3b0feb07dd8d458043077e1d3130a65a617f946784be87266a8044c26db18595b7
+  metadata.gz: 5638354fdec6cb35903bab5ae2b02b9843eb7ae78355e81c35402a597f5452998c46c28352fa4269b89775c4aa003f0d215b1005a5614a25da19a7aa4df2e388
+  data.tar.gz: d904ef610f7a455fe48bc761b80aa129adeb69be7ea1ea3536cedc9d3bd3dbac7ef4dc9b96f19328519d338aab5926031daa7016945cc8940d89266c4030360b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qiita_org (0.1.29)
+    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 = QiitaUpLoad.new(file, mode, os).upload()
+        qiita = QiitaFileUpLoad.new(file, mode, os).upload()
       end
 =begin
       getpath = GetFilePath.new(file)
@@ -117,8 +117,10 @@ 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 [teams/public/private] [options]", "post all org files in the directory"

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/upload.rb

@@ -6,27 +6,34 @@ require "qiita_org/file_open.rb"
 require "qiita_org/set_config.rb"
 require "qiita_org/access_qiita.rb"
 
-class QiitaUpLoad
+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 = get_file_path(@src)
+    #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() #open_file_dir(paths)
-      showfile.open_qiita() #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
@@ -65,17 +72,20 @@ class QiitaUpLoad
 
   def open_qiita()
     conts = File.read(@src)
-    id = conts.match(/\#\+qiita_#{option}: (.+)/)[1]
+    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}"
 
-    items = AccessQiita.new(@access_token, qiita, path).access_qiita()
+    @access = AccessQiita.new(@access_token, qiita, path)
+    items = @access.access_qiita()
 
     @fileopen.file_open(items["url"])
   end
@@ -97,4 +107,14 @@ class QiitaUpLoad
 
     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.30"
+  VERSION = "0.1.31"
 end

metadata

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

data/tests/template.org

@@ -1,14 +0,0 @@
-#+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)