V2 - get working again 2024 (#34)

* Fix some bugs that crept up due to a bad PR and various environmental changes. * Regen rdocs. * Formatting and tweak dockerfile for easy testing on linux.
tangledpath · Mar 21, 2024 · 770ee62 · 770ee62
1 parent c0ab903
commit 770ee62
Show file tree

Hide file tree

Showing 23 changed files with 1,755 additions and 1,595 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,8 @@
 *.bundle
 *.net
 *.log
-.DS_Store
+**/*/.DS_Store
+.vscode
 .config
 coverage
 InstalledFiles

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,7 @@
-FROM ruby:3.0
+FROM ruby:3.2
 
 # Copy function code
-RUN gem install ruby-fann
+RUN mkdir /ruby-fann
+COPY . /ruby-fann
+# RUN gem install ruby-fann
+# RUN bundle install
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
+ruby "~> 3.2"
 
 # Specify your gem's dependencies in ruby-fann.gemspec
 gem 'json', '~> 2'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby-fann (1.4.0)
+    ruby-fann (1.4.3)
 
 GEM
   remote: https://rubygems.org/
@@ -19,5 +19,8 @@ DEPENDENCIES
   rdoc (~> 6)
   ruby-fann!
 
+RUBY VERSION
+   ruby 3.2.2p53
+
 BUNDLED WITH
    2.4.18
diff --git a/History.txt b/History.txt
@@ -1,5 +1,7 @@
+== 2.0.x
+Get working again after a bad pull request.
 == 1.3.x
-Dependabot updates, etc.  
+Dependabot updates, etc.
 == 1.2.7
 * Update to more recent json and rdoc files
 == 1.2.6

diff --git a/build-docker-image.sh b/build-docker-image.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 clear
-npm i
 echo "Removing docker image..."
 docker image rm -f tps:ruby-fann
 echo "Building docker image..."