addons 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fab157f7c200d0c369a7a3bfe156e1fa089b08f
-  data.tar.gz: 022024974b0e8b74d1338bbebfd66cee53499d74
+  metadata.gz: 206557efcf5704dce2feceae56db79a2096ae973
+  data.tar.gz: 45aafece16a4c2e6dac65a6042518b0874a4804a
 SHA512:
-  metadata.gz: 84ef26e4b806b0e9650bccf1df033a018c36d8ea5268f6e91fd5620ba9e1c9f530531caa8cae64a36bb24430db75f68b4bf505ac55882a6a4df231728d83672b
-  data.tar.gz: ee9a870981099af1fdc8172c96c3d29a6f1df2515c7b498d06db4ca3338972eca51a198b9887d38f03134be680ef514f096b4113a2351ce0da58a71ac0cb87a4
+  metadata.gz: 7c0f4dbe2f9f1c6e3fd77fd30b331c1943209045c89bd1745fccda67d009199a2f9f35513eb47adf792430018546b293c4c4657f0a98e78c4acb4d0bf239b692
+  data.tar.gz: 20fbe75007571b7c8c810812b2d268a9dae91d6e59c68003d97e71ad609c6eb8a9a283a2e1a383ce24b39d6b9f3e6f408f6b291843b7b4b91d72a2ad3d350437

data/addons.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Addonlist"]
   spec.email         = ["engineering@addonlist.com"]
   spec.description   = %q{Connect your app to Addons for all your service integrations in one place.}
-  spec.summary       = %q{After configuring your app with addons, set app_id and app_token variables (ENV['ADDONS_API_ID'] and ENV['ADDONS_APP_TOKEN']), the gem will pull your services config and set them up for immediate use.}
+  spec.summary       = %q{After configuring your app with addons, set app_id and auth_token variables (ENV['ADDONS_API_ID'] and ENV['ADDONS_AUTH_TOKEN']), the gem will pull your services config and set them up for immediate use.}
   spec.homepage      = "https://github.com/addonlist/addons-gem"
   spec.license       = "MIT"
 

data/lib/addons/config.rb

@@ -14,7 +14,7 @@ module Addons
 
         if File.exists?(filename)
           File.open(filename, 'r') do |file|
-            # NOTE: read the ADDONS_API_ID and ADDONS_APP_TOKEN from application.yml and set ENV vars.
+            # NOTE: read the ADDONS_API_ID and ADDONS_AUTH_TOKEN from application.yml and set ENV vars.
 
             file.each_line do |line|
               matches = line.match(/(.*): (.*)/)
@@ -26,14 +26,14 @@ module Addons
         end
       end
 
-      puts "checking ENV['ADDONS_API_ID'] and ENV['ADDONS_APP_TOKEN']"
+      puts "checking ENV['ADDONS_API_ID'] and ENV['ADDONS_AUTH_TOKEN']"
 
       if ENV['ADDONS_API_ID'] == nil
         puts "Error: ENV['ADDONS_API_ID'] must be defined"
         return false, "Error: ENV['ADDONS_API_ID'] must be defined"
-      elsif ENV['ADDONS_APP_TOKEN'] == nil
-        puts "Error: ENV['ADDONS_APP_TOKEN'] must be defined"
-        return false, "Error: ENV['ADDONS_APP_TOKEN'] must be defined"
+      elsif ENV['ADDONS_AUTH_TOKEN'] == nil
+        puts "Error: ENV['ADDONS_AUTH_TOKEN'] must be defined"
+        return false, "Error: ENV['ADDONS_AUTH_TOKEN'] must be defined"
       end
 
       # contact server and look for config
@@ -46,7 +46,7 @@ module Addons
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = true
         request = Net::HTTP::Get.new(uri.request_uri)
-        request.basic_auth(ENV['ADDONS_API_ID'], ENV['ADDONS_APP_TOKEN'])
+        request.basic_auth(ENV['ADDONS_API_ID'], ENV['ADDONS_AUTH_TOKEN'])
         response = http.request(request).body
 
         services = JSON.parse(response)
@@ -72,7 +72,7 @@ module Addons
         return true, "Success"
 
       rescue OpenURI::HTTPError => ex
-        return false, "Error: Unauthorized use of Addons. Be sure to set ENV['ADDONS_API_ID'] and ENV['ADDONS_APP_TOKEN']"
+        return false, "Error: Unauthorized use of Addons. Be sure to set ENV['ADDONS_API_ID'] and ENV['ADDONS_AUTH_TOKEN']"
       end
 
     end

data/lib/addons/version.rb

@@ -1,3 +1,3 @@
 module Addons
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/generators/addons/install_generator.rb

@@ -8,16 +8,16 @@ module Addons
     class InstallGenerator < Rails::Generators::Base
 
       class_option :apiid, type: :string, required: true, :desc => "ADDONS_API_ID"
-      class_option :apptoken, type: :string, required: true, :desc => "ADDONS_APP_TOKEN"
+      class_option :authtoken, type: :string, required: true, :desc => "ADDONS_AUTH_TOKEN"
 
       def initialize(*args, &block)
         super
 
         @ADDONS_API_ID = options[:apiid]
-        @addons_app_token = options[:apptoken]
+        @ADDONS_AUTH_TOKEN = options[:authtoken]
 
         puts "ADDONS_API_ID: #{@ADDONS_API_ID}"
-        puts "ADDONS_APP_TOKEN: #{@addons_app_token}"
+        puts "ADDONS_AUTH_TOKEN: #{@ADDONS_AUTH_TOKEN}"
       end
 
       desc "Addons install generator"
@@ -50,7 +50,7 @@ module Addons
         result = `bundle install`
       end
 
-      def bootstrap_app_id_and_token
+      def bootstrap_api_id_and_token
         # write config/application.yml to load env vars on startup
         filename = Rails.root.join('config', 'application.yml')
 
@@ -58,7 +58,7 @@ module Addons
         File.open(filename, 'w') do |file|
           # add new vars to application.yml for the restart
           file.puts "ADDONS_API_ID: #{@ADDONS_API_ID}"
-          file.puts "ADDONS_APP_TOKEN: #{@addons_app_token}"
+          file.puts "ADDONS_AUTH_TOKEN: #{@ADDONS_AUTH_TOKEN}"
         end
 
         puts "created application.yml"

data/lib/tasks/addons_recipe.rake

@@ -19,7 +19,7 @@ namespace :addons do
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
       request = Net::HTTP::Get.new(uri.request_uri)
-      request.basic_auth(ENV['ADDONS_API_ID'], ENV['ADDONS_APP_TOKEN'])
+      request.basic_auth(ENV['ADDONS_API_ID'], ENV['ADDONS_AUTH_TOKEN'])
       response = http.request(request).body
 
       recipes = JSON.parse response

data/spec/addons_spec.rb

@@ -6,8 +6,8 @@ describe Addons::Config do
   end
 
   # it "initializes without errors with valid environment variables" do
-  #   ENV['ADDONS_API_ID'] = 'app_id'
-  #   ENV['ADDONS_APP_TOKEN'] = 'app_token'
+  #   ENV['ADDONS_API_ID'] = 'api_id'
+  #   ENV['ADDONS_AUTH_TOKEN'] = 'auth_token'
 
   #   Addons::Config.init()[0].should eql(true)
   # end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: addons
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Addonlist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-29 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -142,8 +142,8 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: After configuring your app with addons, set app_id and app_token variables
-  (ENV['ADDONS_API_ID'] and ENV['ADDONS_APP_TOKEN']), the gem will pull your services
+summary: After configuring your app with addons, set app_id and auth_token variables
+  (ENV['ADDONS_API_ID'] and ENV['ADDONS_AUTH_TOKEN']), the gem will pull your services
   config and set them up for immediate use.
 test_files:
 - spec/addons_spec.rb