apperol 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91a4bdc6aea992758e4cdc112eab66f5b7a9fb4a
-  data.tar.gz: 680dd1c4cc9449cfce6a1befb765e6997402fbbd
+  metadata.gz: 212cef4edea40eee0f1b4489f04d831ca500d320
+  data.tar.gz: 6bb4f8faf965a79e2856f9ad62439726ce7b6220
 SHA512:
-  metadata.gz: 819ddb160d318ba1219955f387c0580ba4024f62b33972aaf62f8f887d4de726e43afb44537b1492c0e321207539bd445f67e17d68e69848550b7eaccb3c5261
-  data.tar.gz: dd90401ab6224e5ee517339359aec58c063be4570b1cd8d92bba4416367a1d6f7b031b05c4fab5367ac124bb712fa2eb4dc56e828b577ce68c419d1f0c11a49c
+  metadata.gz: 4492e1388a1373e8f359998366a0262ba3fe7cc8331545389d81705a77f65475a0e60c865b5dd13ca7c70d06fbf77dc2115904e5f1d095bf48077b21f17af21c
+  data.tar.gz: fd2dcad0f541185c7c2801d54215c141a100fa3e525c3ce02043200d1f7c28cba400353ec7804c8af8d461b5cda4a7425d844bdfe77be9fe810950ccb4f6d3ae

data/README.md

@@ -29,10 +29,8 @@ Usage: apperol [options] [app_extension]
     -s, --stack stack                Stack for app on heroku
     -b, --branch branch              Branch to setup app from
     -r, --repo repo                  GitHub repository source
-    -o, --org org                    GitHub org where the current repo is located
     -u, --user user                  GitHub user where the current repo is located
     -h, --help                       Displays Help
-
 ```
 
 ## Information
@@ -41,6 +39,11 @@ Usage: apperol [options] [app_extension]
 - Apperol CLI will have many options based on `env` part of the `app.json`
 - Apperol CLI uses heroku org by default, use `-r user/repo` to specify yours.
 
+## Lack of tests
+
+I know it is bad but they will come before v1.0.0 .
+If you dislike this, see next section.
+
 ## Contributing
 
 1. Fork it ( https://github.com/ys/apperol/fork )

data/lib/apperol/app_json.rb

@@ -0,0 +1,47 @@
+module Apperol
+  class AppJson
+    def initialize(file_path = 'app.json')
+      @file_path = file_path
+    end
+
+    def env
+      __json__["env"].map do |key, definition|
+        AppJson::Env.new(key, definition)
+      end
+    end
+
+    def __json__
+      @__json__ ||= JSON.parse(File.read(@file_path))
+    end
+
+    class Env
+      attr_reader :key, :definition
+      def initialize(key, definition)
+        @key = key
+        @definition = definition
+      end
+
+      def value
+        definition.is_a?(String) ? definition : definition["value"]
+      end
+
+      def description
+        definition.is_a?(String) ? key : definition["description"]
+      end
+
+      def needs_value?
+        required? && !has_value?
+      end
+
+      def has_value?
+        !(value.nil? || value.strip.empty?)
+      end
+
+      def required?
+        definition.is_a?(String) ||
+        definition["required"].nil? ||
+        definition["required"]
+      end
+    end
+  end
+end

data/lib/apperol/cli.rb

@@ -6,6 +6,8 @@ require "optparse"
 require "netrc"
 require "spinning_cursor"
 
+require_relative "app_json"
+
 module Apperol
   class CLI
     EX_USAGE = 64
@@ -15,16 +17,10 @@ module Apperol
 
       parser = OptionParser.new do|opts|
         opts.banner = "Usage: apperol [options] [app_extension]"
-        app_json["env"].each do |key, definition|
-          option_key_name = key.downcase.gsub("_", "-")
-          option_key_key = key.downcase.to_sym
-          # Set default
-          value = definition.is_a?(String) ? definition : definition["value"]
-          @options[option_key_key] = value
-          required = definition.is_a?(String) || definition["required"].nil? || definition["required"] ? " required" : ""
-          description = definition.is_a?(String) ? key : definition["description"]
-          opts.on("--#{option_key_name} value", "#{description} (Default: '#{value}' #{required}) ") do |value|
-            @options[option_key_key] = value
+        app_json.env.each do |env_value|
+          option_key_name = env_value.key.downcase.gsub("_", "-")
+          opts.on("--#{option_key_name} value", "#{env_value.description} (Default: '#{env_value.value}' #{env_value.required?}) ") do |value|
+            @options[env_value.key] = value
           end
         end
         opts.on("-p", "--personal", "Force app in personal apps instead of orgs") do
@@ -143,12 +139,13 @@ module Apperol
         overrides: { env: {}}
       }
       required_not_filled = []
-      app_json["env"].each do |key, definition|
-        value = @options[key.downcase.to_sym]
-        if (definition["required"].nil? || definition["required"]) && value.strip.empty?
-          required_not_filled << key
+      app_json.env.each do |env_value|
+        value = @options[env_value.key]
+        value_empty = value.nil? || value.strip.empty?
+        if env_value.needs_value? && value_empty
+          required_not_filled << env_value.key
         end
-        payload[:overrides][:env][key] = value
+        payload[:overrides][:env][env_value.key] = value unless value_empty
       end
       unless required_not_filled.empty?
         $stderr.puts("error: Required fields not filled. Please specify them. #{required_not_filled}")
@@ -251,7 +248,7 @@ module Apperol
         $stderr.puts("No app.json file here")
         exit 1
       end
-      @app_json ||= JSON.parse(File.read("app.json"))
+      @app_json ||= AppJson.new("app.json")
     end
   end
 end

data/lib/apperol/version.rb

@@ -1,3 +1,3 @@
 module Apperol
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apperol
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Yannick
@@ -82,6 +82,7 @@ files:
 - apperol.gemspec
 - bin/apperol
 - lib/apperol.rb
+- lib/apperol/app_json.rb
 - lib/apperol/cli.rb
 - lib/apperol/version.rb
 homepage: https://github.com/ys/apperol