qiita_org 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: beffdb8ca4472a742773b3f18ef4358be70621d887be94f0cc4d7db4bf703f4e
-  data.tar.gz: a9f1c37a7511ec9ed355c39f587511e96dac790b3be07198b54182f8ad94782b
+  metadata.gz: ff5afe51529883ef3f843cc85608ea5eb112c97d9bee65ad71eee130e93ee3d1
+  data.tar.gz: b5945826738b2719a6dc861d60c920edc012db5d49e5c55d8cd464e608c9aab5
 SHA512:
-  metadata.gz: 9b5a5ae877e5c0329f15285cc5de0e9382b485204825e4ecdd3a2c6234e9ee9c9b3bc108f867743ee8795672e8ae302085073e32455f600aee9be71b0c627195
-  data.tar.gz: cdba09e7aee71b7c21b6897e6131bad6013213abc91a407a5a6f0ce2d34125e1331755d7c7935fa5de11168c97e2674200370bb7bb0dfb99b9601052001ed690
+  metadata.gz: 8c7513a96480af4381e23b729a4308265d91721f3d75984cc7d3f28a756f8a386d5aa3d49fffbd00a8f946e2fbc6c77759bb8f61df9544d415315709c1d6dfb3
+  data.tar.gz: 96eb5ad3f7334dd0a14fa481fd33864f03fafc6739d2f6b3ae73b60a6c98d0a07c1a7614684cd7747e0216988052a567c96b6268a387d3085fd31e568a9d8417

data/Gemfile.lock

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

data/lib/qiita_org.rb

@@ -13,6 +13,7 @@ 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"
 
 module QiitaOrg
@@ -38,16 +39,22 @@ module QiitaOrg
       checkos = CheckPcOs.new
       os = checkos.return_os()
 
-      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 $!
+      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
-        qiita.run
+        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
+          qiita.run
+        end
       end
     end
 
@@ -57,10 +64,16 @@ module QiitaOrg
       checkos = CheckPcOs.new
       os = checkos.return_os()
 
-      p file = argv[0] || "README.org"
-      p mode = argv[1] || DecideOption.new(file).decide_option()
+      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()
 
-      UpLoad.new(file, mode, os).upload()
+        qiita = UpLoad.new(file, mode, os).upload()
+      end
 =begin
       getpath = GetFilePath.new(file)
       paths = getpath.get_file_path()

data/lib/qiita_org/error_message.rb

@@ -24,29 +24,33 @@ class ErrorMessage
     exit
   end
 
-  def qiita_post_error(response)
+  def qiita_post_error(response, file)
     message = response.message
     if message != "Created"
       if message != "OK"
         if message == "Unauthorized"
           puts "#{message}".red
           puts "Please check your access_token.".red
+          system "rm #{file}"
           exit
-      elsif message == "Forbidden"
+        elsif message == "Forbidden"
           puts "#{message}".red
           puts "You are not authorized to access this page. please check qiita_id.".red
+          system "rm #{file}"
           exit
         elsif message == "Not Found"
-        puts "#{message}".red
+          puts "#{message}".red
+          system "rm #{file}"
           exit
         else
           puts "#{message}".red
+          system "rm #{file}"
           exit
         end
       end
     end
   end
-  
+
   def config_set_error(conf_dir)
     conf_path = File.join(conf_dir, ".qiita.conf")
     conf = JSON.load(File.read(conf_path))

data/lib/qiita_org/get.rb

@@ -77,7 +77,7 @@ class QiitaGet
         File.write(filename, item["body"])
         convert_md_to_org()
         write_header_on_org()
-        puts_massage_and_delete_md()
+        puts_massage_and_delete_md(item)
       end
     end
   end
@@ -125,9 +125,9 @@ EOS
   end
 
   # see massage and delete id.md
-  def puts_massage_and_delete_md()
+  def puts_massage_and_delete_md(item)
     puts "created #{@id}.org".green
-    puts "URL: #{@items["url"]}"
+    puts "URL: #{item["url"]}"
     system "rm -f #{@id}.md"
   end
 
@@ -155,7 +155,7 @@ EOS
     File.write(filename, @items["body"])
     convert_md_to_org()
     write_header_on_org()
-    puts_massage_and_delete_md()
+    puts_massage_and_delete_md(@items)
   end
 
   def run()
@@ -165,7 +165,7 @@ EOS
     end
 
     if @get_id == nil
-      @qiita, @path = @selectpath.select_path(@mode)
+      @qiita, @path = @selectpath.select_path(@mode, @teams_url)
       @items = AccessQiita.new(@access_token, @qiita, @path).access_qiita()
       select_report()
     else

data/lib/qiita_org/get_multiple_files.rb

@@ -0,0 +1,38 @@
+require "colorize"
+#require "../qiita_org/qiita_org.rb"
+require "qiita_org/post.rb"
+require "qiita_org/upload.rb"
+require "qiita_org/decide_option.rb"
+
+class GetMultipleFiles
+  def initialize(files, os, type)
+    @files = files
+    @option = nil
+    @os = os
+    @type = type
+    unless @files[-1].match(/(.+).org/)
+      @option = @files[-1]
+      @files = @files[0..-2]
+    end
+  end
+
+  def run()
+    puts "post files: #{@files}".green
+    @files.each do |file|
+      mode = @option || DecideOption.new(file).decide_option()
+      puts "qiita #{@type} #{file} #{mode}".green
+      if @type == "post"
+        qiita = QiitaPost.new(file, mode, @os)
+        begin
+          qiita.select_option(mode)
+        rescue RuntimeError => e
+          puts $!
+        else
+          qiita.run
+        end
+      elsif @type == "upload"
+        UpLoad.new(file, mode, @os).upload()
+      end
+    end
+  end
+end

data/lib/qiita_org/list.rb

@@ -15,7 +15,7 @@ class QiitaList
       ErrorMessage.new().teams_url_error(@teams_url)
     end
 
-    @qiita, @path = SelectPath.new().select_path(@mode)
+    @qiita, @path = SelectPath.new().select_path(@mode, @teams_url)
     @items = AccessQiita.new(@access_token, @qiita, @path).access_qiita()
     view_list()
   end

data/lib/qiita_org/post.rb

@@ -110,7 +110,7 @@ class QiitaPost
       res = http_req.post(uri.path, params.to_json, headers)
     end
 
-    ErrorMessage.new().qiita_post_error(res)
+    ErrorMessage.new().qiita_post_error(res, @src.gsub(".org", ".md"))
 
     return res
   end

data/lib/qiita_org/select_path.rb

@@ -2,10 +2,10 @@ class SelectPath
   def initialize()
   end
 
-  def select_path(mode)
+  def select_path(mode, teams_url)
     case mode
     when "teams"
-      qiita = @teams_url
+      qiita = teams_url
       path = "api/v2/items?page=1&per_page=100"
     else
       qiita = "https://qiita.com/"

data/lib/qiita_org/version.rb

@@ -1,3 +1,3 @@
 module QiitaOrg
-  VERSION = "0.1.23"
+  VERSION = "0.1.24"
 end

data/tests/test.org

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

data/tests/test2.org

@@ -1,4 +1,3 @@
-#+qiita_private: ca3a6b6e1f5e8c0ba743
 #+OPTIONS: ^:{}
 #+STARTUP: indent nolineimages
 #+TITLE: test
@@ -18,6 +17,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]]
 
-[[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]]
 
 

data/tests/test3.org

@@ -1,4 +1,4 @@
-#+qiita_teams: bd41ced53b4b18701453
+# +qiita_teams: bd41ced53b4b18701453
 #+OPTIONS: ^:{}
 #+STARTUP: indent nolineimages
 #+TITLE: test

data/tests/test4.org

@@ -1,4 +1,4 @@
-#+qiita_private: 92b50b88e7da7aa25a1b
+# +qiita_private: 92b50b88e7da7aa25a1b
 #+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.23
+  version: 0.1.24
 platform: ruby
 authors:
 - Kenta Yamamoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-11 00:00:00.000000000 Z
+date: 2020-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -967,6 +967,7 @@ files:
 - 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
@@ -984,7 +985,6 @@ files:
 - tests/hoge.rb
 - tests/test.html
 - tests/test.org
-- tests/test2.md
 - tests/test2.org
 - tests/test3.org
 - tests/test4.org

data/tests/test2.md

@@ -1,6 +0,0 @@
-\![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>) 
-
-fogefoge
-
-[![img](../figs/fig1.png)](https://qiita-image-store.s3.ap-northeast-1.amazonaws.com/0/612049/ebf505d2-6960-6bb9-20f0-e16dab142f4a.png)
-