zendesk_apps_tools 1.20.0 → 1.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f59a2d6a2b6db4e5c6b32bd5a2e88ac2f258d57
-  data.tar.gz: 81d6ac4cbb8393781e046b7f20fc97f43d51a338
+  metadata.gz: c9928163ca30c93bfc116df97416ff63cd79db3a
+  data.tar.gz: 41fad016c37ea6d7f7200d895e909821251281d6
 SHA512:
-  metadata.gz: 74f1ff6f06fc42f4ecf02a89b0a2497aa7b6ac637eee1164f0513b1ed3c0549972a0ae5c3d5014dbe94321d857a141c99af062f2a0f7763e2a33ddbd7ecbf3d5
-  data.tar.gz: 202b2e65c2102498834ca34b7c15f02d14460b5dfebce76c1441d189c01c70980de6168734f5ff3391b3574cbcfc8104616ae5bd2128d43f2dbde18f8fbfab47
+  metadata.gz: 8dff809ab9b247991919f9d770350ef614b20bd19fb48ef3bcf7d4531548943f71c408ad90669f102b7fc541791817c298233db7ddf277067fcd317666319782
+  data.tar.gz: 0d8267dbd7748d1863d840b9c7f476781255eb21d9fd01e7e0a58d72b914bc1cea56fb4396df141b910af2892a8ad299afee1547e54abb38c939accb4bb3f991

data/lib/zendesk_apps_tools/api_connection.rb

@@ -6,14 +6,9 @@ module ZendeskAppsTools
     def prepare_api_auth
       @subdomain ||= get_cache('subdomain') || get_value_from_stdin('Enter your Zendesk subdomain or full Zendesk URL:')
       @username  ||= get_cache('username') || get_value_from_stdin('Enter your username:')
+      @password  ||= get_cache('password') || get_password_from_stdin('Enter your password:')
 
-      unless @password
-        print 'Enter your password: '
-        @password ||= STDIN.noecho(&:gets).chomp
-        puts
-
-        set_cache 'subdomain' => @subdomain, 'username' => @username
-      end
+      set_cache 'subdomain' => @subdomain, 'username' => @username
     end
 
     def get_full_url

data/lib/zendesk_apps_tools/command.rb

@@ -101,9 +101,10 @@ module ZendeskAppsTools
 
       settings_helper = ZendeskAppsTools::Settings.new
 
-      settings = settings_helper.get_settings_yaml options[:config], manifest[:parameters]
+      settings = settings_helper.get_settings_from_file options[:config], manifest[:parameters]
+
       unless settings
-        settings = settings_helper.get_settings_from self, manifest[:parameters]
+        settings = settings_helper.get_settings_from_user_input self, manifest[:parameters]
       end
 
       require 'zendesk_apps_tools/server'

data/lib/zendesk_apps_tools/common.rb

@@ -29,5 +29,12 @@ module ZendeskAppsTools
 
       return input
     end
+
+    def get_password_from_stdin(prompt, opts = {})
+      print "#{prompt} "
+      password = STDIN.noecho(&:gets).chomp
+      puts
+      password
+    end
   end
 end

data/lib/zendesk_apps_tools/package_helper.rb

@@ -18,7 +18,7 @@ module ZendeskAppsTools
 
           # resolve symlink to source path
           if File.symlink? file.absolute_path
-            path = File.readlink(file.absolute_path)
+            path = File.expand_path(File.readlink(file.absolute_path), File.dirname(file.absolute_path))
           end
           zipfile.add(file.relative_path, app_dir.join(path).to_s)
         end

data/lib/zendesk_apps_tools/settings.rb

@@ -4,7 +4,7 @@ require 'yaml'
 module ZendeskAppsTools
   class Settings
 
-    def get_settings_from(user_input, parameters)
+    def get_settings_from_user_input(user_input, parameters)
       return {} if parameters.nil?
 
       parameters.inject({}) do |settings, param|
@@ -26,16 +26,22 @@ module ZendeskAppsTools
       end
     end
 
-    def get_settings_yaml(filepath, parameters)
+    def get_settings_from_file(filepath, parameters)
       return {} if parameters.nil?
       return nil unless File.exists? filepath
 
       begin
         settings_file = File.read(filepath)
-        settings_yml = YAML::load(settings_file)
-        settings_yml.each do |index, setting|
+
+        if filepath =~ /\.json$/ || settings_file =~ /\A\s*{/
+          settings_data = JSON.load(settings_file)
+        else
+          settings_data = YAML::load(settings_file)
+        end
+
+        settings_data.each do |index, setting|
           if (setting.is_a?(Hash) || setting.is_a?(Array))
-            settings_yml[index] = JSON.dump(setting)
+            settings_data[index] = JSON.dump(setting)
           end
         end
       rescue => err
@@ -43,14 +49,14 @@ module ZendeskAppsTools
       end
 
       parameters.inject({}) do |settings, param|
-        input = settings_yml[param[:name]]
+        input = settings_data[param[:name]]
 
         if !input && param[:default]
           input = param[:default]
         end
 
         if !input && param[:required]
-          puts "'#{param[:name]}' is required but not specified in the yaml file.\n"
+          puts "'#{param[:name]}' is required but not specified in the config file.\n"
           return nil
         end
 
@@ -74,4 +80,3 @@ module ZendeskAppsTools
 
   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_tools
 version: !ruby/object:Gem::Version
-  version: 1.20.0
+  version: 1.21.0
 platform: ruby
 authors:
 - James A. Rosen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -75,14 +75,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.16.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.16.1
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement