qiita_org 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d23130946a125381e9ded0d662dbaf551e8842076070e02dd8abd8063cb923a1
-  data.tar.gz: 05b6e8fc0799d7060fd7cf86afa59bf0168882104763ac044f7ebfd3716914b3
+  metadata.gz: 2e8c82431a22c64669538797e28a4063ec88e0716014fec98371f3fa03833fa5
+  data.tar.gz: 060c5ba8fb541193fec02aa66570300d2b3801e5c3ead68339267d514c1ae36f
 SHA512:
-  metadata.gz: 1b08b02e2873c25ed0df0c41983d8812b5726532c359308bfe8e0e142b8285eca8e0415809bc13e8b2de6fe7efa841762eb6d65df76296846a069e93f28dd9a7
-  data.tar.gz: 38e0f983e929f0815a17c391af8923b92675ba36c8b1324f4cc619fa4cf8f55e366b56979a0277a1ca0c48217303a8e91cb8eaaa1bb364653f721aa3e43bd0a1
+  metadata.gz: fe04ad5ab1e88a6b722b71e705b0e96fd2378bf19a70f3cdc98e6158ca3c52e707586bd2889c483d249fb658660315445f1d0b0d80402a07f1c597f20a71376d
+  data.tar.gz: e83f076ae7624915c4569f1bc81455882b854d694f0898aab5810825d4653d28356c259657515942c0bc86ea1508f327610fcd228539187ab592f9397d195ba3

data/Gemfile.lock

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

data/lib/qiita_org.rb

@@ -40,9 +40,10 @@ module QiitaOrg
     desc "config", "set config"
 
     def config(*argv)
-      option = argv[0] || nil
-      input = [argv[1], argv[2], argv[3]]
-      config =  QiitaConfig.new(option, input)
+      status = argv[0] || "local"
+      option = argv[1] || nil
+      input = [argv[2], argv[3], argv[4]]
+      config =  QiitaConfig.new(status, option, input)
       config.run
     end
 

data/lib/qiita_org/config.rb

@@ -3,10 +3,20 @@ require "fileutils"
 require "json"
 
 class QiitaConfig
-  def initialize(option, input)
+  def initialize(status, option, input)
     @option = option
     @input = input
-    @setup = "#{ENV["HOME"]}/.qiita.conf"
+    if status == "local"
+      search = SearchConfPath.new(Dir.pwd, Dir.home)
+      conf_dir = search.search_conf_path()
+      if conf_dir == Dir.home || @option == "set"
+        @setup = File.join(Dir.pwd, ".qiita.conf")
+      else
+        @setup = File.join(conf_dir, ".qiita.conf")
+      end
+    else
+      @setup = File.join(Dir.home, ".qiita.conf")
+    end
   end
 
   # check qiita.conf or copy qiita.conf
@@ -14,7 +24,7 @@ class QiitaConfig
     lib = File.expand_path("../../../lib", __FILE__)
     cp_file = File.join(lib, "qiita_org", ".qiita.conf")
 
-    if File.exists?("#{ENV["HOME"]}/.qiita.conf")
+    if File.exists?(@setup) # "# {ENV["HOME"]}/.qiita.conf")
       puts @setup.green
       print_config("now", "black")
     else
@@ -46,7 +56,7 @@ class QiitaConfig
   end
 
   def run()
-    if @option == nil
+    if @option == nil || @option == "set"
       check_or_copy_config()
     else
       set_config()

data/lib/qiita_org/get.rb

@@ -3,16 +3,19 @@ require "json"
 require "open-uri"
 require "io/console"
 require "colorize"
+require "qiita_org/search_conf_path.rb"
 
 class QiitaGet
   def initialize(mode, id)
     @mode = mode
     @get_id = id
+    search = SearchConfPath.new(Dir.pwd, Dir.home)
+    @conf_dir = search.search_conf_path()
   end
 
   # set config
   def set_config()
-    conf_path = File.join(ENV["HOME"], ".qiita.conf")
+    conf_path = File.join(@conf_dir, ".qiita.conf")
     conf = JSON.load(File.read(conf_path))
     @access_token = conf["access_token"]
     @teams_url = conf["teams_url"]

data/lib/qiita_org/get_template.rb

@@ -1,9 +1,12 @@
 require "fileutils"
 require "colorize"
+require "qiita_org/search_conf_path"
 
 class QiitaGetTemplate
   def initialize()
     cp_template()
+    search = SearchConfPath.new(Dir.pwd, Dir.home)
+    @conf_dir = search.search_conf_path()
     set_name_and_email()
     # check_write_header()
     check_write_contents()
@@ -83,7 +86,7 @@ class QiitaGetTemplate
   end
 
   def set_name_and_email()
-    conf_path = File.join(ENV["HOME"], ".qiita.conf")
+    conf_path = File.join(@conf_dir, ".qiita.conf")
     conf = JSON.load(File.read(conf_path))
     name = conf["name"]
     email = conf["email"]

data/lib/qiita_org/list.rb

@@ -2,10 +2,13 @@ require "net/https"
 require "json"
 require "open-uri"
 require "colorize"
+require "qiita_org/search_conf_path.rb"
 
 class QiitaList
   def initialize(mode)
     @mode = mode
+    search = SearchConfPath.new(Dir.pwd, Dir.home)
+    @conf_dir = search.search_conf_path()
     set_config()
     select_path()
     access_qiita()
@@ -13,7 +16,7 @@ class QiitaList
   end
 
   def set_config()
-    conf_path = File.join(ENV["HOME"], ".qiita.conf")
+    conf_path = File.join(@conf_dir, ".qiita.conf")
     conf = JSON.load(File.read(conf_path))
     @access_token = conf["access_token"]
     @teams_url = conf["teams_url"]

data/lib/qiita_org/post.rb

@@ -4,11 +4,15 @@ require "net/https"
 require "json"
 require "command_line/global"
 require "colorize"
+require "qiita_org/search_conf_path.rb"
 
 class QiitaPost
   def initialize(file, option)
     @src = file
     @option = (option == "qiita" || option == "open")? "public" : option
+    search = SearchConfPath.new(Dir.pwd, Dir.home)
+    @conf_dir = search.search_conf_path()
+    p @conf_dir
   end
 
   public
@@ -18,7 +22,7 @@ class QiitaPost
     m = []
     @tags = if m = @conts.match(/\#\+(TAG|tag|Tag|tags|TAGS|Tags): (.+)/)
         if m[2].count(",") >= 5
-          p "The maximum number of tags is five. Please edit tags"
+          puts "The maximum number of tag is five. Please delete some tags.".red
           exit
         end
         m[2].split(",").inject([]) do |l, c|
@@ -31,7 +35,7 @@ class QiitaPost
   end
 
   def set_config()
-    conf_path = File.join(ENV["HOME"], ".qiita.conf")
+    conf_path = File.join(@conf_dir, ".qiita.conf")
     @conf = JSON.load(File.read(conf_path))
     @access_token = @conf["access_token"]
     @teams_url = @conf["teams_url"]
@@ -65,8 +69,9 @@ class QiitaPost
   end
 
   def select_option(option)
-    qiita = (option == "teams")? "https://nishitani.qiita.com/" :
-      "https://qiita.com/"
+    qiita = (option == "teams")? @teams_url : "https://qiita.com/"
+    #qiita = (option == "teams")? "https://nishitani.qiita.com/" :
+     # "https://qiita.com/"
     case option
     when "teams", "qiita", "public", "open"
       private = false

data/lib/qiita_org/search_conf_path.rb

@@ -0,0 +1,18 @@
+class SearchConfPath
+  def initialize(dir, home)
+    @dir = dir
+    @home = home
+    search_conf_path()
+  end
+
+  def search_conf_path()
+    while @dir != @home
+      if File.exists?(File.join(@dir, ".qiita.conf"))
+        return @dir
+      else
+        @dir = @dir.match(/(.+)\//)[1]
+      end
+    end
+    return @dir
+  end
+end

data/lib/qiita_org/version.rb

@@ -1,3 +1,3 @@
 module QiitaOrg
-  VERSION = "0.1.3"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qiita_org
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.8
 platform: ruby
 authors:
 - Kenta Yamamoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-16 00:00:00.000000000 Z
+date: 2020-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -960,6 +960,7 @@ files:
 - lib/qiita_org/hoge.txt
 - lib/qiita_org/list.rb
 - lib/qiita_org/post.rb
+- lib/qiita_org/search_conf_path.rb
 - lib/qiita_org/template.org
 - lib/qiita_org/version.rb
 - qiita_org.gemspec