moss

commit 12172dab98f166b267e3b828d9029228d0bb6e89
parent b80c6880769f63ca6a7226360fe1ea1db5e08bcd
Author: Daniel Barlow <dan@telent.net>
Date:   Mon,  9 Aug 2021 20:17:04 +0100

fix bundix instructions

Diffstat:
M
.gitignore
 | 
2
+-
A
Gemfile.lock
 | 
72
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M
README.md
 | 
4
++--
A
age.nix
 | 
14
++++++++++++++
M
shell.nix
 | 
20
+++++---------------

5 files changed, 94 insertions(+), 18 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -1 +1 @@
-Gemfile.lock
+
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -0,0 +1,72 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    builder (3.2.4)
+    coderay (1.1.3)
+    cucumber (7.0.0)
+      builder (~> 3.2, >= 3.2.4)
+      cucumber-core (~> 10.0, >= 10.0.1)
+      cucumber-create-meta (~> 6.0, >= 6.0.1)
+      cucumber-cucumber-expressions (~> 12.1, >= 12.1.1)
+      cucumber-gherkin (~> 20.0, >= 20.0.1)
+      cucumber-html-formatter (~> 16.0, >= 16.0.1)
+      cucumber-messages (~> 17.0, >= 17.0.1)
+      cucumber-wire (~> 6.0, >= 6.0.1)
+      diff-lcs (~> 1.4, >= 1.4.4)
+      mime-types (~> 3.3, >= 3.3.1)
+      multi_test (~> 0.1, >= 0.1.2)
+      sys-uname (~> 1.2, >= 1.2.2)
+    cucumber-core (10.0.1)
+      cucumber-gherkin (~> 20.0, >= 20.0.1)
+      cucumber-messages (~> 17.0, >= 17.0.1)
+      cucumber-tag-expressions (~> 3.0, >= 3.0.1)
+    cucumber-create-meta (6.0.1)
+      cucumber-messages (~> 17.0, >= 17.0.1)
+      sys-uname (~> 1.2, >= 1.2.2)
+    cucumber-cucumber-expressions (12.1.1)
+    cucumber-gherkin (20.0.1)
+      cucumber-messages (~> 17.0, >= 17.0.1)
+    cucumber-html-formatter (16.0.1)
+      cucumber-messages (~> 17.0, >= 17.0.1)
+    cucumber-messages (17.0.1)
+    cucumber-tag-expressions (3.0.1)
+    cucumber-wire (6.1.0)
+      cucumber-core (~> 10.0, >= 10.0.1)
+      cucumber-cucumber-expressions (~> 12.1, >= 12.1.1)
+      cucumber-messages (~> 17.0, >= 17.0.1)
+    diff-lcs (1.4.4)
+    ffi (1.15.3)
+    method_source (1.0.0)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2021.0704)
+    multi_test (0.1.2)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    sys-uname (1.2.2)
+      ffi (~> 1.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cucumber
+  pry
+  rspec
+
+BUNDLED WITH
+   2.1.4
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ add, generate, edit, show a password, search password names.
 * the Gemfile is needed for installing Cucumber
 
 * the gemset.nix and shell.nix are for Nix users. If you need to edit
-the Gemfile, use `nix-shell bundix --run "bundle lock && bundix"` to
+the Gemfile, use `nix-shell -p bundix --run "bundle lock && bundix"` to
 regenerate gemset.nix
 
 * if you have `entr` installed, you can get fast test feedback by doing
@@ -32,4 +32,4 @@ I don't suggest you do this, at least until moss is a bit more mature.  I am
 only writing this down because I figured out how to
 
     cd $HOME/.password-store
-    for i in `find * -name \*.gpg`   ;do ( gpg -d $i | ~/src/moss/moss.rb add "${i%.*}" );done  
+    for i in `find * -name \*.gpg`   ;do ( gpg -d $i | ~/src/moss/moss.rb add "${i%.*}" );done
diff --git a/age.nix b/age.nix
@@ -0,0 +1,14 @@
+{ buildGoModule
+, fetchFromGitHub }:
+buildGoModule rec {
+  pname = "age";
+  version = "1.0.0-rc.3";
+  vendorSha256 = "sha256-sXUbfxhPmJXO+KgV/dmWmsyV49Pb6CoJLbt50yVgEvI=";
+
+  src = fetchFromGitHub {
+    owner = "FiloSottile";
+    repo = "age";
+    rev = "v${version}";
+    sha256 = "sha256-YXdCTK9/eMvcHWg7gQQiPlLWYx2OjbOJDDNdSYO09HU=";
+  };
+}
diff --git a/shell.nix b/shell.nix
@@ -4,25 +4,15 @@ let gems = bundlerEnv {
       groups = [ "default" "production" "development" "test" ];
       gemdir = ./.;
     };
-    age = pkgs.buildGoModule rec {
-      pname = "age";
-      version = "1.0.0-rc.3";
-      vendorSha256 = "sha256-sXUbfxhPmJXO+KgV/dmWmsyV49Pb6CoJLbt50yVgEvI=";
-      
-      src = fetchFromGitHub {
-        owner = "FiloSottile";
-        repo = "age";
-        rev = "v${version}";
-        sha256 = "sha256-YXdCTK9/eMvcHWg7gQQiPlLWYx2OjbOJDDNdSYO09HU=";
-      };
-    };
+    age = pkgs.callPackage ./age.nix {};
 in mkShell {
-  packages = [  gems gems.wrappedRuby
-    bundix age pkgs.entr ];
+  packages = [
+    gems gems.wrappedRuby
+    bundix age pkgs.entr
+  ];
   shellHook = ''
     run_watch() {
       find . -type f | entr cucumber --publish-quiet -i;
     }
   '';
-
 }