yamlfish 0.1.0.alpha1 → 0.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5aa65ba0ad01cac58be18f2ff437609fa1c7009e586be2bf16e9a2828b80f8fa
-  data.tar.gz: 550c2d63e56849b9efa83e05f73b84f983026233f378beab1287096939c88480
+  metadata.gz: 49157d9d4bd38be7815795f988ec8b7029099a624c461ddd0b10e56f901e1ca5
+  data.tar.gz: 761f1992eb5676261ca80a84a7b1b5b69690052f16ddb5b3445146738232ffd3
 SHA512:
-  metadata.gz: bef480f8b6fed17353e2b1e46f7894b54f0b16eca8c37e379f4b805fc804c042bfe4b33338edf454adc0e3c3cfc167b1637ff59a1821730c7b492c41fc292060
-  data.tar.gz: 3dc0cfed2cf7b244b924a3a4485aa081b3f640e5f232393da93db46e2aa38ac200d02a8c7bab416b6cdd06c1b3e5ffabbe0d61c0af230516fed7a9c7bde99f7e
+  metadata.gz: 4cf03873a81a812551491e8bee607b0a0beefb4000a57de94f789b81cd66fbb76e1b221376e65c2380fa19b35eb56850b4f6c8ffa2313a8289d8d0b09204370d
+  data.tar.gz: 8b5ca3a399a3bed89c3edc87b001c886b6690cd3955ab6b8bd334a0aae155220d085236b858b3ebc892f1d7bc7c0d8203d7ee7d51516b7a0de6e003a96f6b8c7

data/Gemfile.lock

@@ -1,64 +1,67 @@
 PATH
   remote: .
   specs:
-    yamlfish (0.1.0.alpha1)
+    yamlfish (0.1.0.rc1)
       activesupport (>= 6)
       faraday (~> 2.0)
+      rainbow (~> 3.1)
       thor (~> 1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.3)
+    activesupport (7.2.1)
       base64
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     base64 (0.2.0)
-    bigdecimal (3.1.6)
-    concurrent-ruby (1.2.3)
+    bigdecimal (3.1.8)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
-    diff-lcs (1.5.0)
-    drb (2.2.0)
-      ruby2_keywords
-    faraday (2.9.0)
-      faraday-net_http (>= 2.0, < 3.2)
-    faraday-net_http (3.1.0)
+    diff-lcs (1.5.1)
+    drb (2.2.1)
+    faraday (2.11.0)
+      faraday-net_http (>= 2.0, < 3.4)
+      logger
+    faraday-net_http (3.3.0)
       net-http
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    minitest (5.22.2)
-    mutex_m (0.2.0)
+    logger (1.6.0)
+    minitest (5.25.1)
     net-http (0.4.1)
       uri
-    rake (13.0.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
-    ruby2_keywords (0.0.5)
-    thor (1.3.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    securerandom (0.3.1)
+    thor (1.3.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    uri (0.13.0)
+    uri (0.13.1)
 
 PLATFORMS
-  x86_64-darwin-21
-  x86_64-darwin-22
+  arm64-darwin-23
+  ruby
 
 DEPENDENCIES
   rake (~> 13.0)
@@ -66,4 +69,4 @@ DEPENDENCIES
   yamlfish!
 
 BUNDLED WITH
-   2.2.32
+   2.5.18

data/exe/yamlfish

@@ -9,6 +9,9 @@ class YamlfishExe < Thor
   option :branch, type: :string, default: "main"
   def push(locale)
     Yamlfish::Cli::Push.new(locale, branch: options[:branch]).call
+  rescue Errno::ENOENT => e
+    puts Rainbow("Could not push: #{e.message}").red.bright
+    exit 1
   end
 
   desc "pull", "Pulls translations from yamlfish"
@@ -17,6 +20,14 @@ class YamlfishExe < Thor
   option :branch, type: :string, default: "main"
   def pull(locale)
     Yamlfish::Cli::Pull.new(locale, inplace: options[:inplace], force_update: options[:force_update], branch: options[:branch]).call
+  rescue Errno::ENOENT => e
+    puts Rainbow("Could not pull: #{e.message}").red.bright
+    exit 1
+  end
+
+  desc "version", "Prints the version"
+  def version
+    puts Yamlfish::Cli::VERSION
   end
 end
 

data/lib/yamlfish/cli/pull.rb

@@ -25,19 +25,27 @@ module Yamlfish
             "Authorization": "Bearer #{Yamlfish::Cli.configuration.api_key}"
           }
         )
+
+        if response.status != 200
+          puts Rainbow("Failed to pull, unexpected HTTP status #{response.status}").red.bright
+          exit 1
+        end
+
         translations = JSON.parse(response.body)
 
         if @inplace
           replace_inplace(translations)
+          puts "Fetched translations in-place for locale #{Rainbow(@locale_identifier).magenta.bright}"
         else
           dump_translations(translations)
+          puts "Downloaded new translations for locale #{Rainbow(@locale_identifier).magenta.bright}"
         end
       end
 
       private
 
       def replace_inplace(translations)
-        Dir.glob("./config/locales/**/*.yml").each do |filename|
+        Dir.glob("./#{Yamlfish::Cli.configuration.locales_path}/**/*.yml").each do |filename|
           file = YAML.load_file(filename).dot_flatten
           update = false
 
@@ -53,7 +61,7 @@ module Yamlfish
       end
 
       def dump_translations(translations)
-        File.write("./config/locales/#{@locale_identifier}.yml", Yamlfish::Cli::YamlDumper.dump(translations.dot_unflatten))
+        File.write("./#{Yamlfish::Cli.configuration.locales_path}/#{@locale_identifier}.yml", Yamlfish::Cli::YamlDumper.dump(translations.dot_unflatten))
       end
     end
   end

data/lib/yamlfish/cli/push.rb

@@ -12,7 +12,7 @@ module Yamlfish
       end
 
       def call
-        translations = Dir.glob("./config/locales/**/*.yml").each_with_object({}) do |filename, translations|
+        translations = Dir.glob("./#{Yamlfish::Cli.configuration.locales_path}/**/*.yml").each_with_object({}) do |filename, translations|
           translations.deep_merge!(YAML.load_file(filename))
         end
 
@@ -27,7 +27,12 @@ module Yamlfish
             "Authorization": "Bearer #{Yamlfish::Cli.configuration.api_key}"
           }
         )
-        puts response.status
+        if response.status == 201
+          puts "Successfully pushed translations for locale #{Rainbow(@locale_identifier).magenta.bright} on branch #{Rainbow(@branch).magenta.bright}"
+        else
+          puts Rainbow("Failed to push, unexpected HTTP status #{response.status}").red.bright
+          exit 1
+        end
       end
     end
   end

data/lib/yamlfish/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Yamlfish
   module Cli
-    VERSION = "0.1.0.alpha1"
+    VERSION = "0.1.0.rc1"
   end
 end

data/lib/yamlfish/cli.rb

@@ -4,6 +4,7 @@ require_relative "cli/version"
 require_relative "cli/push"
 require_relative "cli/pull"
 require "yaml"
+require "rainbow"
 
 module Yamlfish
   module Cli
@@ -15,9 +16,10 @@ module Yamlfish
     end
 
     class Configuration
-      attr_accessor :api_key, :project_token, :base_url
+      attr_accessor :api_key, :project_token, :base_url, :locales_path
 
       DEFAULT_BASE_URL = "https://yamlfish.dev/api/v1"
+      DEFAULT_LOCALES_PATH = "config/locales"
 
       def initialize
         configuration = begin
@@ -29,6 +31,7 @@ module Yamlfish
         @api_key = configuration["api_key"]
         @project_token = configuration["project_token"]
         @base_url = configuration["base_url"] || DEFAULT_BASE_URL
+        @locales_path = configuration["locales_path"] || DEFAULT_LOCALES_PATH
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yamlfish
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha1
+  version: 0.1.0.rc1
 platform: ruby
 authors:
 - Adrien Siami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-18 00:00:00.000000000 Z
+date: 2024-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 description:
 email:
 - adrien@siami.fr
@@ -92,11 +106,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
 summary: Easily manage your translations with yamlfish