zen_pro 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09bdf662ec106fd06acc6981f1f834c82ea21d8604b5b5cfee72ad3c83de0a50'
-  data.tar.gz: fb856080fad9946ae7d32926226e566f1ae9abdf1617053a5cc3b1b648fc1aba
+  metadata.gz: f0297d94ba1c2a517efa69d0481a7f01e14094227a52b23a0fbd7645b487ed2e
+  data.tar.gz: 832c1824d3313ff11de39fa1e0b87b83887e7fda2ce373c4791c63856ceb0124
 SHA512:
-  metadata.gz: e2dc2a15aa6a0ee277a0aa41bd44d24abc9a0abc16f72e4afd0c100dc36d53623b0158ffc13d182dd1a1572ec701d7eb6a7355a8a4f7f4c002eeba6b1189c169
-  data.tar.gz: 66d71ffd60bf5bcd37326e3116d6acc509c7dae1b56a9d843e478831dd8b75cfb4fb334c3b2e808477c4ceae0d11b48b13a42c0457868e587b45df6aaecba074
+  metadata.gz: 39eb4d9c9498d8f609bd608bc6e331926c93e778d758157d247fca735767d2050c1000926d984021f2b6ba9944cd864af529b09050980870c688e16e641bb4f8
+  data.tar.gz: 9f37c43cffdc433999a4d375c6503250f6bea9b09cf8c97184671b06717dd72971f2fcd8ea3d740495a486860eee9dd956afc301ceb0ae91bd9450a85676ff21

data/CHANGELOG.md

@@ -3,3 +3,9 @@
 ## [0.1.0] - 2024-05-04
 
 - Initial release
+
+## [0.2.0] - 2024-06-04
+
+- Authenticate users with API token
+- Show subscription inactive message if user is on Free plan or has cancelled their subscription
+- Install and use Boring Generators from main branch instead of the latest released version of the gem

data/lib/zen_pro/api/project_template.rb

@@ -1,14 +1,37 @@
 require "rest-client"
+require "tty-box"
 
 module ZenPro
   module Api
     class ProjectTemplate
       def fetch_details(id)
-        response = RestClient.get("#{api_url}/#{id}")
+        response = RestClient.get("#{api_url}/#{id}", authorization_header(id))
 
         JSON.parse(response)
       rescue RestClient::ExceptionWithResponse => e
-        raise e.response
+        prompt = TTY::Prompt.new
+
+        prompt.say <<~RE_LOGIN_MESSAGE if e.response.code == 401
+          You can logout and login again if the API Token had some typo/mistake:
+
+          1. Logout first: zen_pro logout #{id}
+          2. Login back and add correct API Token: zen_pro g #{id}
+        RE_LOGIN_MESSAGE
+
+        json_response = string_to_json(e.response)
+
+        if e.response.code == 403 && json_response &&
+             json_response["is_subscription_inactive"]
+          print TTY::Box.error <<~SUBSCRIPTION_EXPIRED_INSTRUCTIONS
+            It looks like your subscription has either expired or you are on Free plan.
+
+            You can upgrade your account from the following URL:
+
+            https://zeroconfigrails.com/account/teams/#{json_response["team_id"]}/billing/subscriptions
+          SUBSCRIPTION_EXPIRED_INSTRUCTIONS
+        end
+
+        raise(e)
       end
 
       private
@@ -23,6 +46,20 @@ module ZenPro
 
         "#{base_url}/api/v1/project_templates"
       end
+
+      def authorization_header(id)
+        netrc = Netrc.read
+
+        _project_template_id, api_token = netrc["zeroconfigrails.com/#{id}"]
+
+        { Authorization: "Bearer #{api_token}" }
+      end
+
+      def string_to_json(string)
+        JSON.parse(string)
+      rescue StandardError
+        false
+      end
     end
   end
 end

data/lib/zen_pro/cli.rb

@@ -1,6 +1,7 @@
 require "thor"
 
 require_relative "commands/generate"
+require_relative "commands/session"
 require_relative "commands/configure"
 
 module ZenPro
@@ -11,9 +12,19 @@ module ZenPro
     desc "create project and configure gems",
          "Generate a Rails app and configure gems using Project Template configurations"
     def generate(project_template_id)
+      puts "Welcome to Zero Config Rails!\n\n"
+
+      Commands::Session.new(project_template_id).login
+
       Commands::Generate.run(project_template_id, options)
     end
 
+    desc "logout from the current session",
+         "Logout from the current session for a particular project template"
+    def logout(project_template_id)
+      Commands::Session.new(project_template_id).logout
+    end
+
     desc "version", "Display gem version", hide: true
     def version
       say "zen_pro/#{VERSION} #{RUBY_DESCRIPTION}"

data/lib/zen_pro/commands/configure.rb

@@ -17,9 +17,7 @@ module ZenPro
       def execute
         return unless Dir.exist?(app_name)
 
-        if gems_configuration_commands.length.zero?
-          return
-        end
+        return if gems_configuration_commands.empty?
 
         confirm_commands_to_execute
 
@@ -47,7 +45,7 @@ module ZenPro
             .join("\n")
 
         prompt.say <<~BANNER
-        \nRails app is now ready with initial configurations. Next, we will move on to configuring gems you have chosen by executing following commands:
+          \nRails app is now ready with initial configurations. Next, we will move on to configuring gems you have chosen by executing following commands:
 
         #{commands_to_display}
         BANNER

data/lib/zen_pro/commands/create.rb

@@ -85,7 +85,7 @@ module ZenPro
         prompt.say message, color: :blue
 
         Dir.chdir(app_name) do
-          system! "bundle add boring_generators --group=development"
+          system! "bundle add boring_generators --github=\"Zero-Config-Rails/boring_generators\" --branch=main  --group=development"
         end
       end
 

data/lib/zen_pro/commands/generate.rb

@@ -1,7 +1,3 @@
-require "forwardable"
-
-require "thor"
-
 require_relative "create"
 require_relative "configure"
 require_relative "../api/project_template"
@@ -9,8 +5,6 @@ require_relative "../api/project_template"
 module ZenPro
   module Commands
     class Generate
-      extend Forwardable
-
       def self.run(project_template_id, options)
         instance = new
 
@@ -35,15 +29,13 @@ module ZenPro
 
         prompt.error "\nOops, Zen encountered an error!"
 
-        prompt.say "\n#{e.message}"
+        prompt.error "\n#{e.message}"
       end
 
       def welcome_message
         prompt.say <<~BANNER
-            Welcome to Zero Config Rails!
-
-            We will ask you a few questions while all other options will automatically be added as per application configurations in the Web App.
-          BANNER
+          We will ask you few questions while all other options will automatically be added as per application configurations in the Web App.
+        BANNER
       end
 
       def ask_app_name
@@ -54,7 +46,7 @@ module ZenPro
       end
 
       def fetch_project_template_configurations(id)
-        prompt.say "\nFetching your project's configurations from the server ..."
+        prompt.say "\nFetching your project's configurations from the server...\n\n"
 
         ZenPro::Api::ProjectTemplate.new.fetch_details(id)
       end
@@ -64,9 +56,9 @@ module ZenPro
         prompt.ok "Congratulations! Your app is fully configured.\n"
 
         prompt.say <<~BANNER
-        1. Run the rails server with `cd #{app_name} && rails s`
-        2. You can access the app at http://localhost:3000
-      BANNER
+          1. Run the rails server with `cd #{app_name} && rails s`
+          2. You can access the app at http://localhost:3000
+        BANNER
       end
 
       private

data/lib/zen_pro/commands/session.rb

@@ -0,0 +1,68 @@
+require "netrc"
+
+module ZenPro
+  module Commands
+    class Session
+      def initialize(project_template_id)
+        @project_template_id = project_template_id
+      end
+
+      def login
+        return api_token if logged_in?
+
+        api_token_to_save =
+          prompt.ask "Enter your API token for #{project_template_id}:"
+
+        netrc = Netrc.read
+
+        netrc[
+          "zeroconfigrails.com/#{project_template_id}"
+        ] = project_template_id,
+        api_token_to_save
+        netrc.save
+
+        prompt.ok "You are now logged in to the session for #{project_template_id}!\n"
+
+        api_token_to_save
+      rescue StandardError => e
+        prompt.error "\nOops, Zen encountered an error while logging you in!"
+
+        prompt.say "\n#{e.message}"
+
+        raise e
+      end
+
+      def logout
+        netrc = Netrc.read
+
+        netrc.delete("zeroconfigrails.com/#{project_template_id}")
+        netrc.save
+
+        prompt.ok "You are now logged out of the session for #{project_template_id}"
+      end
+
+      private
+
+      attr_reader :project_template_id
+
+      def prompt
+        return @prompt if defined?(@prompt)
+
+        TTY::Prompt.new
+      end
+
+      def logged_in?
+        !api_token.nil?
+      end
+
+      def api_token
+        netrc = Netrc.read
+
+        _project_template_id, api_token =
+          netrc["zeroconfigrails.com/#{project_template_id}"]
+
+        api_token
+      end
+    end
+  end
+end

data/lib/zen_pro/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZenPro
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: zen_pro
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Prabin Poudel
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-04 00:00:00.000000000 Z
+date: 2024-06-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -25,47 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: tty-prompt
+  name: tty-box
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
-  name: tty-spinner
+  name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.23'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: tty-spinner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0.9'
 description: CLI for Zero Config Rails. Run the command and relax (zen mode).
 email:
 - probnpoudel@gmail.com
@@ -85,6 +99,7 @@ files:
 - lib/zen_pro/commands/configure.rb
 - lib/zen_pro/commands/create.rb
 - lib/zen_pro/commands/generate.rb
+- lib/zen_pro/commands/session.rb
 - lib/zen_pro/version.rb
 homepage: https://zeroconfigrails.com
 licenses: