qiita_org 0.1.23 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: beffdb8ca4472a742773b3f18ef4358be70621d887be94f0cc4d7db4bf703f4e
-  data.tar.gz: a9f1c37a7511ec9ed355c39f587511e96dac790b3be07198b54182f8ad94782b
+  metadata.gz: 74ddc5ddc92c8e9414041e6bc9b84b7d96eccf5cc7adba92101440bf70472d65
+  data.tar.gz: fb223cc7d3dbbe232067a5f38dcca6d1f953064972f60307ba206b2fdccf8962
 SHA512:
-  metadata.gz: 9b5a5ae877e5c0329f15285cc5de0e9382b485204825e4ecdd3a2c6234e9ee9c9b3bc108f867743ee8795672e8ae302085073e32455f600aee9be71b0c627195
-  data.tar.gz: cdba09e7aee71b7c21b6897e6131bad6013213abc91a407a5a6f0ce2d34125e1331755d7c7935fa5de11168c97e2674200370bb7bb0dfb99b9601052001ed690
+  metadata.gz: e4dff3873fccd45d6ee707679bb0204076b402183d59b1f4c9d40bb05fe1a27d1d50b04299ff00bf5ce9461aea560426e508ba7ba291aa80cdb548a5d2c0b494
+  data.tar.gz: 72896ad25f227b1cbc0992518a3173b0e2d64ee684be3d2f06db83278ba871abee3331fcd30923a88d4aa6114be93484e6f9dbe096bd5c4e9abfb69db6c1e05e

data/.gitignore

@@ -6,6 +6,10 @@
 /pkg/
 /spec/reports/
 /tmp/
+/gems/
+/gems/*
+/doc/*
+!/doc/.keep
 
 # rspec failure tracking
 .rspec_status

data/.yardopts

@@ -0,0 +1,4 @@
+--protected
+--no-private
+--markup markdown
+--plugin activesupport-concern

data/Gemfile

@@ -5,3 +5,10 @@ gemspec
 
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
+
+group :development do
+  gem 'yard'
+  gem 'guard-yard'
+  gem 'yard-activesupport-concern'
+  gem 'redcarpet'
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qiita_org (0.1.23)
+    qiita_org (0.1.27)
       colorize
       command_line (> 2.0.0)
       fileutils
@@ -10,11 +10,42 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.3)
     colorize (0.8.1)
     command_line (2.0.1)
     diff-lcs (1.4.4)
+    ffi (1.13.1)
     fileutils (1.4.1)
+    formatador (0.2.5)
+    guard (2.16.2)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-yard (2.2.1)
+      guard (>= 1.1.0)
+      yard (>= 0.7.0)
+    listen (3.3.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.8)
+    method_source (1.0.0)
+    nenv (0.3.0)
+    notiffany (0.1.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rake (12.3.3)
+    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)
@@ -28,16 +59,24 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
+    shellany (0.0.1)
     thor (1.0.1)
+    yard (0.9.25)
+    yard-activesupport-concern (0.0.1)
+      yard (>= 0.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (> 1.16)
+  guard-yard
   qiita_org!
   rake (~> 12.0)
+  redcarpet
   rspec (~> 3.0)
+  yard
+  yard-activesupport-concern
 
 BUNDLED WITH
    2.1.4

data/lib/qiita_org.rb

@@ -7,12 +7,14 @@ require "qiita_org/post"
 require "qiita_org/config"
 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"
 
 module QiitaOrg
@@ -38,16 +40,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 +65,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 = QiitaUpLoad.new(file, mode, os).upload()
+      end
 =begin
       getpath = GetFilePath.new(file)
       paths = getpath.get_file_path()
@@ -110,16 +124,8 @@ module QiitaOrg
     desc "all", "post all org files in the directory"
 
     def all(*argv)
-      Dir.glob("*.org").each do |org|
-        puts org.blue
-        if File.read(org).match(/#\+qiita_(.+)/)
-          system ("qiita post #{org} open") if File.read(org).match(/#\+(.+)_public/)
-          system ("qiita post #{org} teams") if File.read(org).match(/#\+(.+)_teams/)
-          system ("qiita post #{org} private") if File.read(org).match(/#\+(.+)_private/)
-        else
-          system ("qiita post #{org}")
-        end
-      end
+      mode = argv[0] || false
+      QiitaAll.new(mode).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

@@ -0,0 +1,31 @@
+require "colorize"
+
+class QiitaAll
+  def initialize(mode)
+    @mode = mode
+    @files = Dir.glob("*.org")
+    p @files
+  end
+
+  def run()
+    @files.each do |file|
+      if file == "template.org"
+        next
+      end
+
+      unless @mode
+        puts file.blue
+        if File.read(file).match(/#\+qiita_(.+)/)
+          system ("qiita post #{file} open") if File.read(file).match(/#\+(.+)_public/)
+          system ("qiita post #{file} teams") if File.read(file).match(/#\+(.+)_teams/)
+          system ("qiita post #{file} private") if File.read(file).match(/#\+(.+)_private/)
+        else
+          system ("qiita post #{file}")
+        end
+      else
+        puts "qiita post #{file} #{@mode}".blue
+        system "qiita post #{file} #{@mode}"
+      end
+    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/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,17 +155,17 @@ 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()
-    @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
 
     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_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

@@ -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

@@ -10,12 +10,12 @@ 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
 
-    @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

@@ -64,6 +64,11 @@ class QiitaPost
     return qiita_id, patch
   end
 
+  # check twitter post
+  def select_twitter(conts, option)
+    option == "public" && conts.match?(/^\#\+twitter:\s*on$/i)
+  end
+
   def select_option(option)
     qiita = (option == "teams")? @teams_url : "https://qiita.com/"
     #qiita = (option == "teams")? "https://nishitani.qiita.com/" :
@@ -86,6 +91,7 @@ class QiitaPost
       "private": @private,
       "title": @title,
       "tags": @tags,
+      "tweet": @twitter,
     }
 
     if @patch
@@ -110,7 +116,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
@@ -127,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
@@ -154,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)
@@ -164,12 +173,13 @@ class QiitaPost
     add_source_path_in_md()
     @lines = MdConverter.new().convert_for_image(@lines)
     @qiita_id, @patch = select_patch_or_post(@conts, @option)
+    @twitter = select_twitter(@conts, @option)
     @qiita, @private = select_option(@option)
     @res = qiita_post()
     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()