diaspora-prosody-config 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 319a9250508cce73f3c978639c549ab1421d7728
-  data.tar.gz: 6c18153465e59487230afd35ddf4a7e1c40b755a
+  metadata.gz: 40adc978303dcd78192493dcdd63bb63bd6debff
+  data.tar.gz: 333053af4529faffc73f1169cf5f6d573e8c73d6
 SHA512:
-  metadata.gz: 4823f31f908b9a8f27903f9e8b739da04b6f7ec712fe69974a7854873119524c56db52f412b8c4eb2ba7aa9f937adcff0899634a3c3f6b2a20b03709e8fae399
-  data.tar.gz: 842c97b987c001745e78374d0033b72352b252bfb9cf53355783f5e996f838a8dc8ee5a82353af277b30d9b63e3552abdfa492f17b81ba429701d96377ee8c37
+  metadata.gz: 30a6128751b83256ff8855935300a2829d7d0243eca008a965c2caf8bf74192cc1f564b784fd62a64e4fe7b6e67fda21f40bca1ce30715fe61d71a64bb00b33a
+  data.tar.gz: 1139ceca50d3875471b597706d7072bba44b85f29ddb4ae45eb00d36799dc9fe9a31f2ebd996fc065eed191f5945abe208b5a0cd5ce91cda023ae51d5d3165f7

data/.gitignore

@@ -2,3 +2,4 @@
 *.log
 tmp
 etc/prosody.cfg.lua
+config/

data/.rubocop.yml

@@ -0,0 +1,13 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-04-05 16:12:03 +0200 using RuboCop version 0.39.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts.
+Style/FileName:
+  Exclude:
+    - 'lib/diaspora-prosody-config.rb'

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 2.1
+script:
+  - bundle exec pronto run -f text -c ${TRAVIS_BRANCH}
+  - bundle exec rake

data/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,66 @@
+PATH
+  remote: .
+  specs:
+    diaspora-prosody-config (0.0.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.4.0)
+    ast (2.2.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    gitlab (3.6.1)
+      httparty
+      terminal-table
+    httparty (0.13.7)
+      json (~> 1.8)
+      multi_xml (>= 0.5.2)
+    json (1.8.3)
+    minitest (5.8.4)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    octokit (4.3.0)
+      sawyer (~> 0.7.0, >= 0.5.3)
+    parser (2.3.0.7)
+      ast (~> 2.2)
+    powerpack (0.1.1)
+    pronto (0.6.0)
+      gitlab (~> 3.6, >= 3.4.0)
+      octokit (~> 4.3, >= 4.1.0)
+      rugged (~> 0.24, >= 0.23.0)
+      thor (~> 0.19.0)
+    pronto-rubocop (0.6.1)
+      pronto (~> 0.6.0)
+      rubocop (~> 0.38, >= 0.35.0)
+    rainbow (2.1.0)
+    rake (10.5.0)
+    rubocop (0.39.0)
+      parser (>= 2.3.0.7, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.7.5)
+    rugged (0.24.0)
+    sawyer (0.7.0)
+      addressable (>= 2.3.5, < 2.5)
+      faraday (~> 0.8, < 0.10)
+    sqlite3 (1.3.11)
+    terminal-table (1.5.2)
+    thor (0.19.1)
+    unicode-display_width (1.0.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  diaspora-prosody-config!
+  minitest
+  pronto
+  pronto-rubocop
+  rake
+  sqlite3
+
+BUNDLED WITH
+   1.10.6

data/Rakefile

@@ -0,0 +1,10 @@
+require 'rake'
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'test'
+  test.pattern = 'test/**/*_test.rb'
+  test.warning = false
+end
+
+task default: [:test]

data/diaspora-prosody-config.gemspec

@@ -1,12 +1,20 @@
 Gem::Specification.new do |s|
   s.name        = 'diaspora-prosody-config'
-  s.version     = '0.0.3'
+  s.version     = '0.0.4'
   s.summary     = 'A prosody config-wrapper for Diaspora'
   s.description = 'A prosody config-wrapper for Diaspora'
+  s.license     = 'GPL-3.0'
+
   s.authors     = ['Lukas Matt']
   s.email       = 'lukas@zauberstuhl.de'
-  s.files       = `git ls-files`.split("\n")
-  s.require_paths = ["lib"]
   s.homepage    = 'https://github.com/zauberstuhl/gem_diaspora-prosody-config'
-  s.license     = 'GPL-3.0'
+
+  s.files       = `git ls-files`.split("\n")
+  s.require_paths = ['lib']
+
+  s.add_development_dependency 'pronto'
+  s.add_development_dependency 'pronto-rubocop'
+  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'rake'
 end

data/etc/prosody.cfg.lua.tpl

@@ -144,8 +144,8 @@ authentication = "internal_plain"
 -- Logging configuration
 -- For advanced logging see http://prosody.im/doc/logging
 log = {
-	info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging
-	error = "prosody.err";
+	info = "log/prosody.log"; -- Change 'info' to 'debug' for verbose logging
+	error = "log/prosody.err";
 	-- "*syslog"; -- Uncomment this for logging to syslog
 	-- "*console"; -- Log to the console, useful for debugging with daemonize=false
 }

data/lib/diaspora-prosody-config.rb

@@ -16,66 +16,77 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require "fileutils"
+require 'fileutils'
 
-class Prosody
-  PROSODYBIN = find_binary
-  GEMDIR = Gem::Specification.find_by_name('diaspora-prosody-config').gem_dir
-  WRAPPERCFG = "#{GEMDIR}/etc/prosody.cfg.lua"
-  DIASPORACFG = "#{FileUtils.pwd}/config/prosody.cfg.lua"
+module Prosody
+  GEMDIR = Gem::Specification.find_by_name(
+    'diaspora-prosody-config'
+  ).gem_dir.freeze
 
-  def initialize
-    init_config
+  WRAPPERCFG = "#{GEMDIR}/etc/prosody.cfg.lua".freeze
+  DIASPORACFG = "#{FileUtils.pwd}/config/prosody.cfg.lua".freeze
+
+  def self.start
+    check_sanity && system("#{find_binary} --config #{WRAPPERCFG}")
   end
 
-  def start
-    system("#{PROSODYBIN} --config #{WRAPPERCFG}")
+  def self.update_configuration
+    # update prosody cfg in diaspora config dir
+    gemcfg = "#{WRAPPERCFG}.tpl"
+    unless File.exist?(DIASPORACFG)
+      FileUtils.cp(gemcfg, DIASPORACFG)
+    end
+
+    config = File.read(DIASPORACFG)
+    config_params.each do |k, v|
+      begin
+        v = 'MySQL' if v.include?('mysql2')
+        v = 'PostgreSQL' if v.include?('postgresql')
+        v = 'SQLite3' if v.include?('sqlite3')
+      rescue
+        warn("Warning! #{k} is empty")
+      end
+      config.gsub!(/\#\{#{k}\}/, "#{v}")
+    end
+    File.open(WRAPPERCFG, 'w') {|f| f.write(config) }
   end
 
   private
-  def find_binary
+
+  def self.find_binary
     ENV['PATH'].split(':').each do |p|
       prosodybin = "#{p}/prosody"
-      return prosodybin if File.exists?(prosodybin)
+      return prosodybin if File.exist?(prosodybin)
     end
-    abort("Prosody executable is missing please update your PATH variable")
+    abort('Prosody executable is missing please update your PATH variable')
   end
 
-  def init_config
-    # do some sanity checks
-    begin
-      require "bcrypt"
-    rescue LoadError
-      abort("bcrypt is required for diaspora authentication")
+  def self.check_sanity
+    # check on bcrypt and warn
+    bcrypt_so = %x(find /usr/local/lib -name bcrypt.so) rescue ''
+    warn('bcrypt is required for diaspora authentication') if bcrypt_so.empty?
+    # check prosody version
+    about = %x(#{find_binary}ctl about)
+    version_string = begin
+      about.match(/prosody\s(\d+\.\d+\.\d+)/i).captures[0]
+    rescue
+      abort('something went wrong with prosdoyctl')
     end
-    version = Gem::Version.new(0)
-    about = %x(#{PROSODYBIN}ctl about)
-    version_string = about.match(/prosody\s(\d+\.\d+\.\d+)/i).captures[0]
     version = Gem::Version.new(version_string)
-    abort("wasn't able to detect prosody installation") if version == Gem::Version.new(0)
-    abort("your're prosody version should be >= 0.9.0") if version < Gem::Version.new("0.9.0")
-    # check if Diaspora-configuration is available
-    abort("wasn't able to detect the Diaspora environment") unless defined?(AppConfig)
-    abort("wasn't able to detect the Rails environment") unless defined?(Rails)
-
-    # update prosody cfg in diaspora config dir
-    gemcfg = "#{WRAPPERCFG}.tpl"
-    unless File.exists?(DIASPORACFG)
-      FileUtils.cp(gemcfg, DIASPORACFG)
+    if version < Gem::Version.new('0.9.0')
+      abort('your\'re prosody version should be >= 0.9.0')
     end
+    abort('wasn\'t able to detect the Diaspora environment') unless defined?(AppConfig)
+    abort('wasn\'t able to detect the Rails environment') unless defined?(Rails)
 
-    config = File.read(DIASPORACFG)
-    config_params.each do |k, v|
-      config.gsub!(/\#\{#{k}\}/, "#{v}")
-    end
-    File.open(WRAPPERCFG, 'w') {|f| f.write(config) }
+    update_configuration
   end
 
-  def config_params
+  def self.config_params
     db = Rails.application.config.database_configuration[Rails.env]
     hostname = AppConfig.environment.url
       .gsub(/^http(s){0,1}:\/\/|\/$/, '')
-      .to_s rescue "localhost"
+      .to_s rescue 'localhost'
 
     return {
       plugin_path: "#{GEMDIR}/modules",

data/test/lib_dpc_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+describe Prosody do
+  def setup
+    FileUtils.mkdir_p('config')
+    ENV['PATH'] = 'test/scripts'
+  end
+
+  def test_working_setup
+    assert_equal 'Startup', %x(prosody)
+    assert_equal 'Prosody 0.9.0', %x(prosodyctl)
+  end
+
+  def test_dpc
+    assert_equal true, Prosody.start
+  end
+end

data/test/scripts/prosody

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo -n "Startup"

data/test/scripts/prosodyctl

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo -n "Prosody 0.9.0"

data/test/test_helper.rb

@@ -0,0 +1,29 @@
+require 'diaspora-prosody-config'
+require 'minitest/autorun'
+require 'fileutils'
+
+# AppConfig.environment.url
+module AppConfig
+  module Url
+    def self.url; 'localhost'; end
+  end
+  def self.environment; Url; end
+end
+
+# Rails.application.config.database_configuration[Rails.env]
+module Rails
+  module Config
+    module Db
+      def self.database_configuration
+        {
+          'development' => {
+          'adapter' => 'sqlite3',
+          'database' => 'test.db'
+        }}
+      end
+    end
+    def self.config; Db; end
+  end
+  def self.env; 'development'; end
+  def self.application; Config; end
+end

metadata

@@ -1,15 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: diaspora-prosody-config
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Lukas Matt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
-dependencies: []
+date: 2016-04-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: pronto
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pronto-rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A prosody config-wrapper for Diaspora
 email: lukas@zauberstuhl.de
 executables: []
@@ -17,12 +87,21 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
+- Gemfile
+- Gemfile.lock
 - LICENSE
+- Rakefile
 - diaspora-prosody-config.gemspec
 - etc/prosody.cfg.lua.tpl
 - lib/diaspora-prosody-config.rb
 - modules/mod_auth_diaspora.lua
 - modules/mod_diaspora_contacts.lua
+- test/lib_dpc_test.rb
+- test/scripts/prosody
+- test/scripts/prosodyctl
+- test/test_helper.rb
 homepage: https://github.com/zauberstuhl/gem_diaspora-prosody-config
 licenses:
 - GPL-3.0