trove 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a501c7fded530b2dc537d412eae735c19cfa25f04e2e21dd8d6861ae42b2a271
-  data.tar.gz: 0cf407da8dce52a446e053a7e03791622ecd303a6514bdf551ce12bd31ebe788
+  metadata.gz: 969613b215dd90871123cfb6cf1c839280c9a097ab5eb3f8837dffff0d5ad01a
+  data.tar.gz: 28e2959384053285ec39956d50ddb2138fe7277a1c3f9dc777575afddc5368e7
 SHA512:
-  metadata.gz: 4ad4fa70071eb4745046938a9b042b7df87eaa85964bc4d9a71fa90837335e40d8195f9de7ea27d70963c83a4facd163a1542527f7f88a5ffeb6aec8b4b71649
-  data.tar.gz: 73b4037bf7a50b498ef6d6bb640f2d62e237c7a1effba0aa298c9a54cf8d56edbd6efd539bdfc0768e1e6e1c85d3e8d2f524c60f5b996469881b6d67a66f9d1d
+  metadata.gz: 0eef9a86d4a4dbb8f54bd547b155eddc8510b68a760e67e4860b8ca8690782d34f224f96506852510ca945a874564a7d279e52acf37f56ac7999cb30992cc4b3
+  data.tar.gz: bac12e3d0ec42be4e8f67384232517bf2ba8f2759ba8d0675f0e23ae0091bd5d96ecbc6d9d092178dd2626c1ed0c9244021a2fb382ae88c061d95a7782926306

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.2.0 (2023-04-11)
+
+- Improved error messages
+- Fixed error with missing dependencies
+- Fixed error with `list` when no files
+- Dropped support for Ruby < 3
+
+## 0.1.1 (2020-12-04)
+
+- Added support for running in subdirectories
+
 ## 0.1.0 (2020-10-30)
 
 - First release

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020 Andrew Kane
+Copyright (c) 2020-2023 Andrew Kane
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -9,7 +9,7 @@ Works great with [XGBoost](https://github.com/ankane/xgboost), [Torch.rb](https:
 Add this line to your application’s Gemfile:
 
 ```ruby
-gem 'trove'
+gem "trove"
 ```
 
 And run:
@@ -82,7 +82,7 @@ If your production servers only need to pull files, only give them `s3:GetObject
 
 Git is great for code, but it’s not ideal for large files like models. Instead, we use an object store like Amazon S3 to store and version them.
 
-Trove creates an `trove` directory for you to use as a workspace. Files in the directory are ignored by Git, but can be pushed and pulled from the object store. By default, files are tracked in `.trove.yml` to make it easy to deploy specific versions with code changes.
+Trove creates a `trove` directory for you to use as a workspace. Files in this directory are ignored by Git but can be pushed and pulled from the object store. By default, files are tracked in `.trove.yml` to make it easy to deploy specific versions with code changes.
 
 ## Getting Started
 
@@ -132,7 +132,7 @@ remote:        Asset precompilation completed (30.00s)
 
 ### Docker
 
-And add to your `Dockerfile`:
+Add to your `Dockerfile`:
 
 ```Dockerfile
 RUN bundle exec trove pull
@@ -200,7 +200,7 @@ This makes it easy to perform operations from code, iRuby notebooks, and the Rai
 
 ## Automated Training
 
-By default, Trove tracks files in `.trove.yml` so you can deploy specific versions with `trove pull`. However, this functionality is entirely optional. Disable it with:
+By default, Trove tracks files in `.trove.yml` to make it easy to deploy specific versions with code changes. However, this functionality is entirely optional. Disable it with:
 
 ```yml
 vcs: false
@@ -208,6 +208,15 @@ vcs: false
 
 This is useful if you want to automate training or build more complex workflows.
 
+## Non-Ruby
+
+Trove can be used in non-Ruby projects as well.
+
+```sh
+gem install trove
+trove init
+```
+
 ## History
 
 View the [changelog](https://github.com/ankane/trove/blob/master/CHANGELOG.md)

data/lib/trove/cli.rb

@@ -77,7 +77,7 @@ module Trove
         end
       end
       column_names = columns.map { |c| c.to_s.sub(/_at\z/, "").upcase }
-      widths = columns.map.with_index { |c, i| [column_names[i].size, data.map { |r| r[c].to_s.size }.max].max }
+      widths = columns.map.with_index { |c, i| [column_names[i].size, data.map { |r| r[c].to_s.size }.max || 0].max }
 
       output = String.new("")
       str = widths.map { |w| "%-#{w}s" }.join("     ") + "\n"

data/lib/trove/storage/s3.rb

@@ -34,7 +34,7 @@ module Trove
           # delete file if interrupted
           File.unlink(tmp) if File.exist?(tmp)
         end
-      rescue Aws::S3::Errors::ServiceError
+      rescue Aws::S3::Errors::NoSuchKey, Aws::S3::Errors::NotFound
         raise "File not found"
       end
 
@@ -59,7 +59,7 @@ module Trove
           version: resp.version_id,
           md5: resp.etag.gsub('"', "")
         }
-      rescue Aws::S3::Errors::ServiceError
+      rescue Aws::S3::Errors::NoSuchKey, Aws::S3::Errors::NotFound
         nil
       end
 
@@ -68,7 +68,7 @@ module Trove
         options[:version_id] = version if version
         client.delete_object(**options)
         true
-      rescue Aws::S3::Errors::ServiceError
+      rescue Aws::S3::Errors::NoSuchKey, Aws::S3::Errors::NotFound
         false
       end
 

data/lib/trove/version.rb

@@ -1,3 +1,3 @@
 module Trove
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/trove.rb

@@ -1,10 +1,11 @@
 # stdlib
 require "digest/md5"
+require "uri"
 require "yaml"
 
 # modules
-require "trove/utils"
-require "trove/version"
+require_relative "trove/utils"
+require_relative "trove/version"
 
 module Trove
   # storage
@@ -30,7 +31,7 @@ module Trove
     # could use upload_file method for multipart uploads over a certain size
     # but multipart uploads have extra cost and cleanup, so keep it simple for now
     def push(filename)
-      src = File.join(root, filename)
+      src = resolve_path(filename)
       raise "File not found" unless File.exist?(src)
 
       info = storage.info(filename)
@@ -89,7 +90,7 @@ module Trove
     private
 
     def pull_file(filename, version: nil, all: false)
-      dest = File.join(root, filename)
+      dest = resolve_path(filename)
 
       if !version
         file = (config["files"] || []).find { |f| f["name"] == filename }
@@ -120,15 +121,36 @@ module Trove
       Digest::MD5.file(src).hexdigest != info[:md5]
     end
 
-    # TODO test file not found
     def config
       @config ||= begin
-        begin
-          YAML.load_file(".trove.yml")
-        rescue Errno::ENOENT
-          raise "Config not found"
-        end
+        config = YAML.load_file(config_path)
+        raise "Empty config" unless config.is_a?(Hash)
+        config
+      end
+    end
+
+    def config_path
+      @config_path ||= search_tree(".trove.yml")
+    end
+
+    def config_dir
+      File.dirname(config_path)
+    end
+
+    def search_tree(file)
+      path = Dir.pwd
+      # prevent infinite loop
+      20.times do
+        absolute_file = File.join(path, file)
+        return absolute_file if File.exist?(absolute_file)
+        path = File.dirname(path)
+        break if path == "/"
       end
+      raise "Config not found"
+    end
+
+    def resolve_path(filename)
+      File.join(config_dir, root, filename)
     end
 
     def root
@@ -137,7 +159,14 @@ module Trove
 
     def storage
       @storage ||= begin
-        uri = URI.parse(config["storage"])
+        raise "Missing storage" unless config["storage"]
+
+        uri =
+          begin
+            URI.parse(config["storage"])
+          rescue URI::InvalidURIError => e
+            raise "Invalid storage"
+          end
 
         case uri.scheme
         when "s3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trove
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-31 00:00:00.000000000 Z
+date: 2023-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: rexml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,49 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
-  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: rake
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
 description:
-email: andrew@chartkick.com
+email: andrew@ankane.org
 executables:
 - trove
 extensions: []
@@ -108,14 +80,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Deploy machine learning models in Ruby (and Rails)