havesnippet-client 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ac4e9b5ee614251051ff34a2616484532590b557
-  data.tar.gz: 1dd21bd2d50c0703b345ae338a49fd5efc4f3b95
+SHA256:
+  metadata.gz: 53dc988b7083baa27b165b60221bc9c10ac21ebbf83c0ad1e31b60d33c3a05ac
+  data.tar.gz: 2600f0fc76533942809b698acd984adf54f859c7ef3378a8177f9b770888a18f
 SHA512:
-  metadata.gz: 19c0b50dd46667f3654dd66f0a5e811aacf303f500ee971d9cae67ea5e4c5a8591a4ea521d0ec8fd80d2d9862a3ffc8b08451a0d017b0ec991c64a8c7395d18b
-  data.tar.gz: 7a92a1f0d69addc354a64c4fb9c78f243cd16fc2d31c9b3033f2d11778074892cffa7532e5fe8d3cb991b8bd34b61fb8bcdc3fb9e0d6c6ddff9ca1770ebd23b2
+  metadata.gz: bfe54298ec900ddf47aebbdc6c16f1f2730f8cbd25a4ad5fcb96d3d1c72652a5352740d856a6bb60b8e6524c640904ebf16a1644a34755af0cefb0dcd22fd0b4
+  data.tar.gz: c715748dd00ab2608ce53a2f7c325753049ad7259a44f61b56c0e7e67368ff761e8f502098daceba7b0ac53e369e0c5cece12972c8513d1d3414865595ce390f

data/.editorconfig

@@ -0,0 +1,11 @@
+# http://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+
+[*.rb]
+indent_size = 2
+indent_style = space
+trim_trailing_whitespace = true

data/.gitignore

@@ -0,0 +1,2 @@
+pkg
+Gemfile.lock

data/CHANGELOG

@@ -1,3 +1,8 @@
+* Wed Sep 05 2018 - version 1.2.0
+- Rename local config to ~/.havesnippet-client
+- Search for configs in /etc/havesnippet-client and /var/secrets/havesnippet-client
+- Read all available configs and merge configuration options
+
 * Sat Nov 19 2016 - version 1.1.0
 - Fix expiration set by --year and --month
 - Use DateTime.iso8601 to parse expiration times

data/default.nix

@@ -0,0 +1,31 @@
+let
+  pkgs = import <nixpkgs> {};
+  stdenv = pkgs.stdenv;
+
+in stdenv.mkDerivation rec {
+  name = "havesnippet-client";
+
+  buildInputs = [
+    pkgs.ruby
+    pkgs.git
+    pkgs.openssl
+  ];
+
+  shellHook = ''
+    mkdir -p /tmp/dev-ruby-gems
+    export GEM_HOME="/tmp/dev-ruby-gems"
+    export GEM_PATH="$GEM_HOME:$PWD/lib"
+    export PATH="$GEM_HOME/bin:$PATH"
+
+    BUNDLE="$GEM_HOME/bin/bundle"
+
+    [ ! -x "$BUNDLE" ] && ${pkgs.ruby}/bin/gem install bundler
+
+    export BUNDLE_PATH="$GEM_HOME"
+    export BUNDLE_GEMFILE="$PWD/Gemfile"
+
+    $BUNDLE install
+
+    export RUBYOPT=-rbundler/setup
+  '';
+}

data/lib/havesnippet-client/cli.rb

@@ -33,23 +33,23 @@ END
         opts.on('-k', '--api-key KEY', 'API key used to authenticate the user') do |v|
           @opts[:api_key] = v
         end
-        
+
         opts.on('-f', '--filename NAME', 'File name, including the extension') do |v|
           @opts[:file_name] = v
         end
-        
+
         opts.on('-l', '--language LANG', 'Language used to highlight the syntax') do |v|
           @opts[:language] = v
         end
-        
+
         opts.on('-L', '--list-languages', 'List available languages') do
           @opts[:languages] = true
         end
-        
+
         opts.on('-t', '--title TITLE', 'Title for the snippet') do |v|
           @opts[:title] = v
         end
-        
+
         opts.on('-a', '--access MODE', ACCESS_MODES, "Accessibility (#{ACCESS_MODES.join(',')})") do |v|
           @opts[:accessibility] = translate_access(v)
         end
@@ -76,11 +76,11 @@ END
           @opts[:expiration] = nil
           @expiration_delta = nil
         end
-        
+
         opts.on('--clear', 'Clear any previously configured options') do
           @opts.clear
         end
-        
+
         opts.on('--save', 'Save settings to config file') do
           @opts[:save] = true
         end
@@ -136,12 +136,18 @@ END
     end
 
     def load
-      return unless File.exists?(config_path)
+      rename_config
+
+      config_paths.each do |path|
+        next unless File.exist?(path)
+
+        cfg = YAML.load(File.read(path))
 
-      @opts = YAML.load(File.read(config_path))
-      
-      if @opts[:expiration_interval]
-        @opts[:expiration] = Time.now.to_i + @opts[:expiration_interval]
+        if cfg[:expiration_interval]
+          cfg[:expiration] = Time.now.to_i + cfg[:expiration_interval]
+        end
+
+        @opts.update(cfg)
       end
     end
 
@@ -157,11 +163,27 @@ END
         data.delete(:expiration_interval)
       end
 
-      File.open(config_path, 'w') { |f| f.write(YAML.dump(data)) }
+      File.open(local_config_path, 'w') { |f| f.write(YAML.dump(data)) }
+    end
+
+    def local_config_path
+      File.join(Dir.home, '.havesnippet-client')
     end
 
-    def config_path
-      File.join(Dir.home, '.havesnippet')
+    def config_paths
+      [
+        '/etc/havesnippet-client',
+        '/var/secrets/havesnippet-client',
+        local_config_path,
+      ]
+    end
+
+    def rename_config
+      old = File.join(Dir.home, '.havesnippet')
+
+      if File.exist?(old) && !File.exist?(local_config_path)
+        File.rename(old, local_config_path)
+      end
     end
   end
 end

data/lib/havesnippet-client/version.rb

@@ -1,5 +1,5 @@
 module HaveSnippet
   module Client
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: havesnippet-client
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jakub Skokan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-19 00:00:00.000000000 Z
+date: 2018-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
 - !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'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Client for HaveSnippet, a self-hosted paste service
@@ -61,6 +61,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
+- ".gitignore"
 - CHANGELOG
 - Gemfile
 - LICENSE.txt
@@ -68,6 +70,7 @@ files:
 - Rakefile
 - bin/havesnippet
 - bin/hs
+- default.nix
 - havesnippet-client.gemspec
 - lib/havesnippet-client/cli.rb
 - lib/havesnippet-client/client.rb
@@ -83,19 +86,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Client for HaveSnippet, a self-hosted paste service
 test_files: []
-has_rdoc: