del 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e67e31d143d4f281e3a84bc7b448a4e2ed054a7adb27980707c815bd2d78ef06
-  data.tar.gz: 61cb7af3141e43aca19d2d34b7c5b972b2ded2ff7938f055b88d3caec3d2160d
+  metadata.gz: a77cac965aab73b5f4ffa5a8d716c667a54520b53fe0e289fe83bbd1314c0aac
+  data.tar.gz: e26595b3fdead4f34a45d8013a03b966af71473f04129ad7d6ba916787cc7b8e
 SHA512:
-  metadata.gz: d6783eea8a35d332c8ab91651752c6daec1e30dc812ff426e2fd495f090a355235b069082806a63a24270e8a8c571676e5e99954f60270d9728d042d7f5864df
-  data.tar.gz: 16d26e8a33abfb87806b81478dde5056f0b1f1f443b467562226d3b1e8b661188f883ac1fd23b0d69dc3e73bb1d417f6567f20de90582f9b3af39e3ed4c0c007
+  metadata.gz: 54817e96d1273968f2c843e2312210600937709f1e91e37aab4ed6084c7e3abe1b2b6f5ac6f5e1b15a58badeb676d893efd4e78ae07eee7a772cc5b8a9b60955
+  data.tar.gz: dc0df766410fee11000c9ea24c7bcddc2048b2078ff0a5fda5a6e6aa647ef4bf7851ec012cb5d4b7aca0f2698883a3d821aa2bd9a99e67deacad750da43c743c

data/bin/console

@@ -11,8 +11,8 @@ require "del"
 # Pry.start
 
 require "irb"
-Del.start(
-  dotenv_file: Pathname.new(Dir.home).join(".delrc"),
-  start_server: false,
-)
+
+settings = YAML.load(IO.read(Pathname.new(Dir.home).join(".delrc")))
+settings.merge!(start_server: false)
+Del.start(settings)
 IRB.start(__FILE__)

data/del.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "dotenv", "~> 2.4"
   spec.add_dependency "xmpp4r", "~> 0.5"
   spec.add_dependency "thor", "~> 0.20"
   spec.add_development_dependency "bundler", "~> 1.16"

data/lib/del.rb

@@ -1,4 +1,3 @@
-require "dotenv"
 require "json"
 require "logger"
 require "socket"
@@ -6,6 +5,7 @@ require "xmpp4r"
 require "xmpp4r/muc/helper/mucbrowser"
 require "xmpp4r/muc/helper/simplemucclient"
 require "xmpp4r/roster/helper/roster"
+require "yaml"
 
 require "del/configuration"
 require "del/connection"
@@ -20,18 +20,14 @@ require "del/user"
 require "del/version"
 
 module Del
-  def self.start(dotenv_file:, startup_file: nil, start_server: true, socket_file: nil)
-    puts "Loading... #{dotenv_file}"
-    Dotenv.load(dotenv_file.to_s)
-    Del.configure do |config|
-      config.socket_file = socket_file if socket_file
-      config.router.register(/.*/) do |message|
-        logger.debug(message.to_s)
-      end
-      config.load(startup_file)
+  def self.start(settings)
+    @configuration = Configuration.new(settings)
+    @configuration.router.register(/.*/) do |message|
+      logger.debug(message.to_s)
     end
-    del = Robot.new(configuration: configuration)
-    del.get_funky!(start_server: start_server)
+    @configuration.load(settings[:startup_file])
+    del = Robot.new(configuration: @configuration)
+    del.get_funky!(start_server: settings[:start_server])
   end
 
   def self.configure
@@ -39,7 +35,7 @@ module Del
   end
 
   def self.configuration
-    @configuration ||= Configuration.new
+    @configuration ||= Configuration.new({})
   end
 
   def self.logger

data/lib/del/cli.rb

@@ -5,16 +5,22 @@ require "thor"
 module Del
   class CLI < Thor
     DEFAULT_RC=Pathname.new(Dir.home).join(".delrc")
-    class_option :dotenv_file, default: ENV.fetch("DELRC", DEFAULT_RC)
+    class_option :configuration_file, default: ENV.fetch("DELRC", DEFAULT_RC)
     class_option :socket_file, default: Del::Configuration::SOCKET_FILE
+    class_option :log_level, default: Logger::INFO
 
     desc "server <routes.rb>", "start server"
     def server(startup_file = nil)
-      Del.start(
-        dotenv_file: options[:dotenv_file],
-        socket_file: options[:socket_file],
-        startup_file: startup_file,
-      )
+      settings = YAML.load(IO.read(options[:configuration_file]))
+      settings.merge!(log_level: options[:log_level])
+      settings.merge!(socket_file: options[:socket_file])
+      settings.merge!(start_server: true)
+      settings.merge!(startup_file: startup_file)
+
+      Del.start(settings)
+    rescue Errno::ENOENT => error
+      say error.message, :red
+      say "run 'del setup'", :yellow
     end
 
     desc "message <jid> <message>", "send a message to the Jabber ID"
@@ -31,6 +37,23 @@ module Del
       socket&.close
     end
 
+    desc "setup", "setup your $HOME/.delrc"
+    def setup
+      settings = {
+        host: ask("Where is your xmpp server? (E.g. 'chat.hipchat.com')"),
+        jid: ask("What is your jabber Id?"),
+        muc_domain: ask("What is your MUC domain? (E.g. 'conf.hipchat.com')"),
+        full_name: ask("What is your name?"),
+        password: ask("What is your password?", echo: false),
+      }
+
+      say ""
+      say "Writing your configuration to: #{options[:configuration_file]}", :green
+      yaml = YAML.dump(settings)
+      IO.write(options[:configuration_file], yaml)
+      File.chmod(0600, options[:configuration_file])
+    end
+
     desc "version", "Print the version of this gem"
     def version
       say Del::VERSION, :green

data/lib/del/configuration.rb

@@ -14,18 +14,18 @@ module Del
     attr_accessor :users
     attr_accessor :socket_file
 
-    def initialize
-      @default_rooms = ENV.fetch("DEL_ROOMS", '').split(',')
-      @host = ENV.fetch("DEL_HOST", 'chat.hipchat.com')
-      @jid = ENV.fetch("DEL_JID")
+    def initialize(settings = {})
+      @default_rooms = settings.fetch(:rooms, [])
+      @host = settings.fetch(:host, 'chat.hipchat.com')
+      @jid = settings.fetch(:jid)
       @logger = Logger.new(STDOUT)
-      @logger.level = ENV.fetch('LOG_LEVEL', Logger::INFO).to_i
-      @muc_domain = ENV.fetch("DEL_MUC_DOMAIN", "conf.hipchat.com")
-      @name = ENV.fetch("DEL_FULL_NAME")
-      @password = ENV.fetch("DEL_PASSWORD")
+      @logger.level = settings.fetch(:log_level, Logger::INFO).to_i
+      @muc_domain = settings.fetch(:muc_domain, "conf.hipchat.com")
+      @name = settings.fetch(:full_name)
+      @password = settings.fetch(:password)
       @rooms = Repository.new
       @router = DefaultRouter.new
-      @socket_file = SOCKET_FILE
+      @socket_file = settings.fetch(:socket_file, SOCKET_FILE)
       @users = Repository.new
     end
 

data/lib/del/robot.rb

@@ -9,7 +9,7 @@ module Del
     end
 
     def get_funky!(start_server: true)
-      Del.logger.info("It's fire! 🔥")
+      Del.logger.info("🔥🔥🔥")
       xmpp_connection.connect(self)
       socket_server.run(self) if start_server
     rescue Interrupt

data/lib/del/version.rb

@@ -1,3 +1,3 @@
 module Del
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: del
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - mo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-05 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: dotenv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: xmpp4r
   requirement: !ruby/object:Gem::Requirement