local_pac 0.1.7 → 0.1.8

data/files/config.yaml

@@ -1,6 +1,4 @@
 ---
-:storage_path: ~/.local/share/pacfiles/cache/cache.pstore
-:import_paths:
-- ~/.local/share/pacfiles/new
-- ~/.pacfiles/new
-- /var/pacfiles/new
+:log_sink: ~/.local/share/local_pac/log
+:local_storage: ~/.local/share/local_pac/data
+:pid_file: ~/.local/share/local_pac/run/pid

data/lib/local_pac/config.rb

@@ -28,7 +28,7 @@ module LocalPac
         yaml = Psych.load_file(file)
 
         if yaml.respond_to? :[]
-          @config = yaml.freeze
+          @config = yaml.symbolize_keys.freeze
         else
           @config = {}.freeze
         end
@@ -59,7 +59,6 @@ module LocalPac
 
     def candiate_files
       [
-        File.expand_path(File.join(Dir.getwd, 'config.yaml')),
         File.expand_path(File.join(ENV['HOME'], '.config', 'local_pac', 'config.yaml')),
         File.expand_path(File.join(ENV['HOME'], '.local_pac', 'config.yaml')),
         File.expand_path(File.join('/etc', 'local_pac', 'config.yaml')),

data/lib/local_pac/version.rb

@@ -1,4 +1,4 @@
 #main LocalPac
 module LocalPac
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/share/archlinux/PKGBUILD

@@ -1,16 +1,17 @@
 # Maintainer: Max Meyer <dev@fedux.org>
 pkgname=local_pac
-pkgver=0.1.6
-pkgrel=2
+pkgver=0.1.7
+pkgrel=1
 pkgdesc="local pacfile serving server"
 arch=(i686 x86_64)
 url="https://github.com/dg-vrnetze/${pkgname}"
 license=('MIT')
 depends=(ruby)
+install=${pkgname}.install
 makedepends=(rubygems filegen)
 source=(http://gems.rubyforge.org/gems/$pkgname-$pkgver.gem)
 noextract=($pkgname-$pkgver.gem)
-sha256sums=('1141ef7b1eafd1b67fe210ae3dde9d72b397b48842ae6b3f377a093af56a9094')
+sha256sums=('8a37d7b0b48401daaba6d6151fd603b61b0e33848a3faee69502598b11042236')
 
 package() {
   cd "$srcdir"
@@ -19,10 +20,19 @@ package() {
   _share_dir="${_library_dir}/gems/${pkgname}-${pkgver}/share"
   _systemd_dir=/usr/lib/systemd/system
   _bin_dir=/usr/bin
+  _data_dir=/var/${pkgname}/data
+  _log_dir=/var/log/${pkgname}
+  _config_dir=/etc/${pkgname}
+  _examples_dir=/usr/share/${pkgname}/examples
 
   install -d ${pkgdir}/$_library_dir 
   install -d ${pkgdir}/$_bin_dir 
   install -d ${pkgdir}/$_systemd_dir 
+  install -d ${pkgdir}/$_data_dir
+  install -d ${pkgdir}/$_log_dir
+  install -d ${pkgdir}/$_config_dir
+
+  install -d -m 644 ${pkgdir}${_share_dir}/archlinux/config.yaml ${pkgdir}${_examples_dir}/config.yaml.example
 
   GEM_HOME="${pkgdir}/${_library_dir}" GEM_ROOT="${pkgdir}/${_library_dir}" GEM_PATH="${pkgdir}/${_library_dir}" gem install --env-shebang --wrappers --no-ri --no-rdoc --install-dir ${pkgdir}/${_library_dir} $pkgname
 

data/share/archlinux/config.yaml

@@ -0,0 +1,3 @@
+---
+:log_sink: /var/log/local_pac
+:local_storage: /var/local_pac/data

data/share/archlinux/local_pac.install

@@ -0,0 +1,12 @@
+post_install() {
+  echo "Please place a config file at one of the following places:"
+  echo " * $HOME/.config/local_pac/config.yaml"
+  echo " * $HOME/.local_pac/config.yaml"
+  echo " * /etc/local_pac/config.yaml"
+
+  echo  "An example config file can be found at \"/usr/share/local_pac/examples/config.yaml.example\""
+}
+
+post_upgrade() {
+  post_install
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: local_pac
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -200,6 +200,8 @@ files:
 - local_pac.gemspec
 - share/archlinux/Makefile
 - share/archlinux/PKGBUILD
+- share/archlinux/config.yaml
+- share/archlinux/local_pac.install
 - share/archlinux/startup.erb
 - share/examples/config.yaml
 - share/systemd/local_pac.service