bwrap 1.0.0.pre.alpha1 → 1.0.0.pre.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4193a0724aceb154c2e9be0809366ed2998837beeeb577dc101a58e20dca97d
-  data.tar.gz: a927a6a6b8cb415f3983440ca0437b852582227f5b163f34143ffb375dc96a40
+  metadata.gz: cd1c029789733da3f76f30e1de8647ae2844ee70e7b3558944c9fda0e8c48cdd
+  data.tar.gz: b2a46db9002fd1c9699ab4d763d1e98105c69539b1fcd05afeb9a9c887fe09f7
 SHA512:
-  metadata.gz: f2f49d20cf15a331d34439d71ef038645bc2a5520407cdb519ea8f5e9e32db526dd7524ad35939acd8098a328d6a3c1c2542d5fde44d0adcfd8ae26f2313d5fb
-  data.tar.gz: ee295629e684ef280652e38a94e7731b6e3227a2bac1150a79da268f3d2972eaac889ac1928103edf9d022c84430898ebc53d008a6f181d412d3f1ede441d0a9
+  metadata.gz: 375d76049c7654c40258892a1d3a3e6d062ad80c75402560be71298572c58d5284151966c5b388c16f836999daea732d39fa1ab91a31f9ebd925476ef198fd75
+  data.tar.gz: 0e31779606b0f8add41c8ff2c1420a39bfe84cad10dae64c1107161791a404569797c89ed3b8401c0976002203a025f078f603d145c7e9673d037e29cb0d5a0d

data/CHANGELOG.md

@@ -1,7 +1,16 @@
 # Changes
 
+## 1.0.0-alpha2 (14.11.2021)
+
+* Made gem to tell its license (ISC)
+* Gem building now allows newer bundler versions than 1.17
+* Added Config#xorg_application option
+* Properly resolve /etc/resolv.conf
+
 ## 1.0.0-alpha1 (10.11.2021)
 
+* First working version
+
 ## 0.1.0 (unreleased)
 
 * First, currently unfinished and unreleased version. Work in Progress.

data/lib/bwrap/args/construct.rb

@@ -54,6 +54,8 @@ class Bwrap::Args::Construct
 
   # Arguments for generating .Xauthority file.
   private def xauthority_args
+    return [] unless @config.xorg_application
+
     xauth_args = %W{ --ro-bind #{Dir.home}/.Xauthority #{Dir.home}/.Xauthority }
     debug "Binding following .Xauthority file: #{Dir.home}/.Xauthority"
     xauth_args
@@ -61,10 +63,12 @@ class Bwrap::Args::Construct
 
   # Arguments to read-only bind /etc/resolv.conf.
   private def resolv_conf
-    #source_resolv_conf = "/etc/resolv.conf"
-    source_resolv_conf = "/run/netconfig/resolv.conf"
+    # We can’t really bind symlinks, so let’s resolve real path to resolv.conf, in case it is symlinked.
+    source_resolv_conf = Pathname.new "/etc/resolv.conf"
+    source_resolv_conf = source_resolv_conf.realpath
+
     debug "Binding #{source_resolv_conf} as /etc/resolv.conf"
-    %w{ --ro-bind /run/netconfig/resolv.conf /etc/resolv.conf }
+    %W{ --ro-bind #{source_resolv_conf} /etc/resolv.conf }
   end
 
   # Arguments to create `/run/user/#{uid}`.

data/lib/bwrap/config.rb

@@ -26,6 +26,12 @@ class Bwrap::Config
 
   attr_accessor :user
 
+  # Set to true to indicate we’re running a X.org application, meaning we need to do some extra holes,
+  # like binding .Xauthority.
+  #
+  # @return [Boolean] Whether Xorg specific binds are used.
+  attr_accessor :xorg_application
+
   # Array of directories to be bind mounted and used to construct PATH environment variable.
   attr_reader :binaries_from
 

data/lib/bwrap/version.rb

@@ -3,7 +3,7 @@
 # bwrap command runner tools.
 module Bwrap
   # Current version of bwrap.
-  VERSION = "1.0.0-alpha1"
+  VERSION = "1.0.0-alpha2"
 end
 
-require "deep-cover" if ENV["DEEP_COVER"]
+require "deep-cover" if ENV["DEEP_COVER"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bwrap
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha1
+  version: 1.0.0.pre.alpha2
 platform: ruby
 authors:
 - Samu Voutilainen
@@ -54,14 +54,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.17'
 - !ruby/object:Gem::Dependency
@@ -149,7 +149,8 @@ files:
 - lib/bwrap/output/output.rb
 - lib/bwrap/version.rb
 homepage: https://git.sr.ht/~smar/ruby-bwrap
-licenses: []
+licenses:
+- ISC
 metadata:
   homepage_uri: https://git.sr.ht/~smar/ruby-bwrap
   source_code_uri: https://git.sr.ht/~smar/ruby-bwrap