qiita_org 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e1d39ee46dabf4d2acd53bd27ad8f825a1717981cd63231c2431e531f5cf8ee
-  data.tar.gz: 5e6e874f3f83341978fba00585728811dfebf001e4cccc159ea24c958aa9aeb0
+  metadata.gz: 72dc27665b3c0c77fe171a3440a39e610d0cf2bb5649259ec0d0e3d13b51d0d2
+  data.tar.gz: 29cdbf92e0e8b1001085796a60ff7537fec377ef49577252c9783e12c0982888
 SHA512:
-  metadata.gz: b9c49a2e0405a8627caee3b7893d3abab9c957698e3b686ee6a590ab56432d70c4365a99e1c9f68a9b2e08554e2600c427af8413562d0aed7d3b328037d13869
-  data.tar.gz: 39239a9bd1ada1fd34b42d8a27f6176d82ea7e986d8e3c2f7a434780ed9dc3d0e4c37a9d8019e49fe43263bd1f89b6650e797e0e7aee645960c887319e29413d
+  metadata.gz: 270d6285dac1e3d4e03feccaa075ef87ff259d07ac7ad862860b57307d132bd3b09311db5f215d96d32add017a013e3dbb6b7faa14c342e01f20a2ad489f55c4
+  data.tar.gz: 676b4534810880410bc134aa96bf174e72e447a412a7b4211d27e77481e52e88bf6b377d88dae22191ee11f1693afa693cb09525a58559e136efbf08db4594bf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qiita_org (0.1.3)
+    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
+        @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

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
@@ -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.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qiita_org
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Kenta Yamamoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-16 00:00:00.000000000 Z
+date: 2020-09-30 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