sambal 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd8dcc698177728a2089a8ef9bf157d4e1e0d11e59083399b5b0fceecf9b0331
-  data.tar.gz: 8ff8321bc0480bc5fe4422c697dceceb0a2743e0a4ac6e35cfc4ef4dab739ee4
+  metadata.gz: 0a50e0a519bdbc0ab8cccb0116250c2b073e5e305a906d9f46fac5012dc11814
+  data.tar.gz: 71ac3f8493eae53b548a0e58a207e38034615af0f0d915956d50ab338b5bc16e
 SHA512:
-  metadata.gz: 313f5d0d5ae699228ba5874cc69f72debe1ae7364643e2040d19aa98ae81e874017be52978c576e67478a7bb63ce27170db00f3801dc262b9620778a367f22f1
-  data.tar.gz: 040f2c1e8d7bf126feeda45bdf28c6aeba75778f9491afd5d2999e1b15953540e74239ad0d1ca92518ba51ccff030df3ec84175a172609800f6e7a9671f5bb61
+  metadata.gz: 5e14f217b9d83deceae6bd11a17d94ce17ca59800850031a0d57d416fe5f1f1431a0de3b8c9d9e8a3f4b4695f9d4e16b15fa2e2cbb808cf16ba409ad60dc67d3
+  data.tar.gz: ba2eb773c39c1dccfd4b71dbe2b184f453b17cf02690124d010d30d18d3456e4976a7d33f5b11bacda7c192882d1336b686f859ca0147a736ac0a9ff8191ede4

data/.envrc

@@ -0,0 +1 @@
+use_nix

data/Jenkinsfile

@@ -0,0 +1,34 @@
+#!/usr/bin/groovy
+
+def hasCmd(cmd) { "command -v ${cmd} >/dev/null 2>&1" }
+
+def shell(cmd) {
+  def nixInitPath = '$HOME/.nix-profile/etc/profile.d/nix.sh'
+  sh """
+     if ! ${hasCmd('nix-shell')}; then
+        if [ -e ${nixInitPath} ]; then
+           . ${nixInitPath}
+        else
+           curl https://nixos.org/nix/install | sh
+           . ${nixInitPath}
+        fi
+     fi
+     ${cmd}
+     """
+}
+
+def nixShell(cmd) { shell """ nix-shell --run "${cmd}" """ }
+
+node('linux') {
+  stage("Prerequisites") { shell """ nix-env -iA nixpkgs.git """ }
+
+  stage("Checkout") { checkout scm }
+
+  stage("Setup") { nixShell '''
+                            bundle install
+                            mkdir -p /tmp/sambal-temp-path
+                            '''
+                 }
+
+  stage("Test") { nixShell "SAMBAL_TEMP_PATH=/tmp/sambal-temp-path bundle exec rspec" }
+}

data/README.md

@@ -1,4 +1,4 @@
-[![Circle CI](https://circleci.com/gh/johnae/sambal.svg?style=svg)](https://circleci.com/gh/johnae/sambal)
+[![Build Status](https://ci.insane.se/buildStatus/icon?job=sambal/master)](https://ci.insane.se/job/sambal/job/master/)
 
 # Sambal
 
@@ -27,14 +27,15 @@ On a mac this can be installed through homebrew https://github.com/mxcl/homebrew
 
     brew install samba
 
-On the Mac it can probably also be installed both through Fink and MacPorts.
-
 On Linux (Ubuntu) it's as easy as:
 
     apt-get install smbclient
 
 It should be available in a similar way on all major Linux distributions.
 
+If you happen to be running [NixOS](https://nixos.org/) or at least the [Nix package manager](https://nixos.org/nix/download.html) you could just
+use the `default.nix` file in this repo. That should also set you up for running the tests (which require samba).
+
 ## Usage
 
     client = Sambal::Client.new(domain: 'WORKGROUP', host: '127.0.0.1', share: '', user: 'guest', password: '--no-pass', port: 445)

data/default.nix

@@ -0,0 +1,6 @@
+with import <nixpkgs> {};
+
+stdenv.mkDerivation {
+ name = "sambal";
+ buildInputs = [ ruby rake samba ];
+}

data/lib/sambal/client.rb

@@ -252,7 +252,7 @@ module Sambal
     end
 
     def ask(cmd)
-      @input.printf("#{cmd}\n")
+      @input.print("#{cmd}\n")
       response = @output.expect(/^smb:.*\\>/,@timeout)[0] rescue nil
       if response.nil?
         $stderr.puts "Failed to do #{cmd}"

data/lib/sambal/test_server.rb

@@ -39,7 +39,7 @@ module Sambal
       @erb_path = "#{File.expand_path(File.dirname(__FILE__))}/smb.conf.erb"
       @host = "127.0.0.1" ## will always just be localhost
       @root_path = File.expand_path(File.dirname(File.dirname(File.dirname(__FILE__))))
-      @tmp_path = "#{root_path}/spec_tmp"
+      @tmp_path = ENV.key?('SAMBAL_TEMP_PATH') ? ENV['SAMBAL_TEMP_PATH'] : "#{root_path}/spec_tmp"
       @share_path = "#{tmp_path}/share"
       @share_name = share_name
       @config_path = "#{tmp_path}/smb.conf"
@@ -71,11 +71,11 @@ module Sambal
     def start
       if RUBY_PLATFORM=="java"
         @smb_server_pid = Thread.new do
-          `smbd -S -F -s #{@config_path} -p #{@port} --option="lockdir"=#{@lock_path} --option="pid directory"=#{@pid_dir} --option="private directory"=#{@private_dir} --option="cache directory"=#{@cache_dir} --option="state directory"=#{@state_dir} > #{@log_path}/smb.log`
+          `smbd -S -F -s #{@config_path} -p #{@port} --option="lockdir"=#{@lock_path} --option="pid directory"=#{@pid_dir} --option="private directory"=#{@private_dir} --option="cache directory"=#{@cache_dir} --option="state directory"=#{@state_dir} < /dev/null > #{@log_path}/smb.log`
         end
       else
         @smb_server_pid = fork do
-          `smbd -S -F -s #{@config_path} -p #{@port} --option="lockdir"=#{@lock_path} --option="pid directory"=#{@pid_dir} --option="private directory"=#{@private_dir} --option="cache directory"=#{@cache_dir} --option="state directory"=#{@state_dir} > #{@log_path}/smb.log`
+          exec "smbd -S -F -s #{@config_path} -p #{@port} --option=\"lockdir\"=#{@lock_path} --option=\"pid directory\"=#{@pid_dir} --option=\"private directory\"=#{@private_dir} --option=\"cache directory\"=#{@cache_dir} --option=\"state directory\"=#{@state_dir} < /dev/null > #{@log_path}/smb.log"
         end
       end
       sleep 2 ## takes a short time to start up

data/lib/sambal/version.rb

@@ -1,5 +1,5 @@
 # coding: UTF-8
 
 module Sambal
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sambal
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - John Axel Eriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-12 00:00:00.000000000 Z
+date: 2018-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -31,13 +31,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".envrc"
 - ".gitignore"
 - Gemfile
+- Jenkinsfile
 - LICENSE
 - README.md
 - Rakefile
 - Spookfile
-- circle.yml
+- default.nix
 - lib/sambal.rb
 - lib/sambal/client.rb
 - lib/sambal/response.rb
@@ -66,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Ruby Samba Client

data/circle.yml

@@ -1,4 +0,0 @@
-dependencies:
-  pre:
-    - sudo apt-get update -qq
-    - sudo apt-get install -y smbclient samba