addons 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b1f48899f1dcbaf1336913a3e4212ee1221bf0a
-  data.tar.gz: 6761392fc427226f1466592bf4942effee8b3c5e
+  metadata.gz: 7fab157f7c200d0c369a7a3bfe156e1fa089b08f
+  data.tar.gz: 022024974b0e8b74d1338bbebfd66cee53499d74
 SHA512:
-  metadata.gz: 2d6ec04265ee6c58aea869d1f88a365079deb94fd68efa7c01bb4b1513eb7962f57955007003fa0dc9cf4f42e132407248ac6fed2193b425ee1518bd8d5d231e
-  data.tar.gz: 7f27557fc9550412a72917aa0ed1631e45ae50e7b2a88709e663a382291e4675da5c27a59b6872887697623f48daa33b04cace039ad5e565d77d20b9a823141e
+  metadata.gz: 84ef26e4b806b0e9650bccf1df033a018c36d8ea5268f6e91fd5620ba9e1c9f530531caa8cae64a36bb24430db75f68b4bf505ac55882a6a4df231728d83672b
+  data.tar.gz: ee9a870981099af1fdc8172c96c3d29a6f1df2515c7b498d06db4ca3338972eca51a198b9887d38f03134be680ef514f096b4113a2351ce0da58a71ac0cb87a4

data/Gemfile

@@ -3,6 +3,5 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in addons.gemspec
 gemspec
 
-gem 'rest_client'
 gem 'json'
 gem 'rails'

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    addons (0.1.0)
-      json
+    addons (0.1.1)
+      figaro (~> 0.7.0)
+      json (~> 1.8.1)
 
 GEM
   remote: https://rubygems.org/
@@ -48,7 +49,6 @@ GEM
     mime-types (1.25.1)
     minitest (4.7.5)
     multi_json (1.9.2)
-    netrc (0.7.7)
     polyglot (0.3.4)
     rack (1.5.2)
     rack-test (0.6.2)
@@ -66,9 +66,7 @@ GEM
       activesupport (= 4.0.3)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.1)
-    rest_client (1.7.2)
-      netrc (~> 0.7.7)
+    rake (10.3.1)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -101,9 +99,7 @@ PLATFORMS
 DEPENDENCIES
   addons!
   bundler (~> 1.3)
-  figaro
   json
   rails
-  rake
-  rest_client
+  rake (~> 10.3.1)
   rspec (~> 2.6)

data/addons.gemspec

@@ -9,8 +9,8 @@ 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_APP_ID'] and ENV['ADDONS_APP_TOKEN']), the gem will pull your services config and set them up for immediate use.}
-  spec.homepage      = ""
+  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.homepage      = "https://github.com/addonlist/addons-gem"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -18,12 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rest_client"
-  spec.add_dependency "json"
-  spec.add_dependency "figaro"
+  spec.add_dependency "json", "~> 1.8"
+  spec.add_dependency "figaro", "~> 0.7"
 
-  spec.add_development_dependency "rails"
+  spec.add_development_dependency "rails", "~> 4.1"
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake", "~> 10.3"
   spec.add_development_dependency "rspec", "~> 2.6"
 end

data/lib/addons/config.rb

@@ -2,19 +2,19 @@ require 'net/http'
 require 'open-uri'
 require 'json'
 
-BASE_CONFIG_URL = "https://launchpack.io/api/v1/apps/config"
+BASE_CONFIG_URL = "https://addonlist.com/api/v1/addons/apps/config"
 
 module Addons
   class Config
     def self.init
       puts "Initializing Addons::Config"
 
-      if ENV['ADDONS_APP_ID'].nil? or ENV['ADDONS_APP_ID'] == ""
+      if ENV['ADDONS_API_ID'].nil? or ENV['ADDONS_API_ID'] == ""
         filename = Rails.root.join('config', 'application.yml')
 
         if File.exists?(filename)
           File.open(filename, 'r') do |file|
-            # NOTE: read the ADDONS_APP_ID and ADDONS_APP_TOKEN from application.yml and set ENV vars.
+            # NOTE: read the ADDONS_API_ID and ADDONS_APP_TOKEN from application.yml and set ENV vars.
 
             file.each_line do |line|
               matches = line.match(/(.*): (.*)/)
@@ -26,21 +26,28 @@ module Addons
         end
       end
 
-      puts "checking ENV['ADDONS_APP_ID'] and ENV['ADDONS_APP_TOKEN']"
+      puts "checking ENV['ADDONS_API_ID'] and ENV['ADDONS_APP_TOKEN']"
 
-      if ENV['ADDONS_APP_ID'] == nil
-        puts "Error: ENV['ADDONS_APP_ID'] must be defined"
-        return false, "Error: ENV['ADDONS_APP_ID'] must be defined"
+      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"
       end
 
       # contact server and look for config
-      configUrl = "#{BASE_CONFIG_URL}?app_id=#{ENV['ADDONS_APP_ID']}&app_token=#{ENV['ADDONS_APP_TOKEN']}&source=rubygem"
+      configUrl = "#{BASE_CONFIG_URL}?source=rubygem"
 
       begin
-        response = URI.parse(configUrl).read
+
+        uri = URI.parse(configUrl)
+
+        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'])
+        response = http.request(request).body
 
         services = JSON.parse(response)
 
@@ -65,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_APP_ID'] and ENV['ADDONS_APP_TOKEN']"
+        return false, "Error: Unauthorized use of Addons. Be sure to set ENV['ADDONS_API_ID'] and ENV['ADDONS_APP_TOKEN']"
       end
 
     end

data/lib/addons/recipes/instructions.rb

@@ -19,9 +19,9 @@ module Addons
           "error_msg" => "Error: You have unstaged files or uncommitted changes in Git. Please commit or stash everything so we can start on a clean slate.",
         }
         GIT_COMMIT_RECIPE = {
-          "run_msg" => "Committing changes made by #{Addons::Recipe::RECIPE_NAME_PLACEHOLDER} version: #{Addons::Recipe::RECIPE_VERSION_PLACEHOLDER} Launchpack.io recipe",
+          "run_msg" => "Committing changes made by #{Addons::Recipe::RECIPE_NAME_PLACEHOLDER} version: #{Addons::Recipe::RECIPE_VERSION_PLACEHOLDER} AddonList recipe",
           "type" => InstructionTypes::TERMINAL_COMMAND,
-          "command" => "git add .; git commit -m \"LAUNCHPACK RECIPE  - #{Addons::Recipe::RECIPE_NAME_PLACEHOLDER} version: #{Addons::Recipe::RECIPE_VERSION_PLACEHOLDER}\"",
+          "command" => "git add .; git commit -m \"ADDONLIST RECIPE  - #{Addons::Recipe::RECIPE_NAME_PLACEHOLDER} version: #{Addons::Recipe::RECIPE_VERSION_PLACEHOLDER}\"",
           "expected_result" => {
             "type" => ResultTypes::NO_EXPECTATION
           },

data/lib/addons/recipes/recipe.rb

@@ -42,7 +42,7 @@ module Addons
     end
 
     def self.run(recipe)
-      puts "\r\nRunning Launchpack.io #{recipe["platform"]} recipe for: #{recipe["name"]}\r\n\r\n"
+      puts "\r\nRunning AddonList #{recipe["platform"]} recipe for: #{recipe["name"]}\r\n\r\n"
 
       Addons::Recipe::Commons::GIT_READY_RECIPE.each do |git_instruction|
         run_instruction(git_instruction, recipe)

data/lib/addons/version.rb

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

data/lib/generators/addons/install_generator.rb

@@ -7,16 +7,16 @@ module Addons
   module Generators
     class InstallGenerator < Rails::Generators::Base
 
-      class_option :appid, type: :string, required: true, :desc => "ADDONS_APP_ID"
+      class_option :apiid, type: :string, required: true, :desc => "ADDONS_API_ID"
       class_option :apptoken, type: :string, required: true, :desc => "ADDONS_APP_TOKEN"
 
       def initialize(*args, &block)
         super
 
-        @addons_app_id = options[:appid]
+        @ADDONS_API_ID = options[:apiid]
         @addons_app_token = options[:apptoken]
 
-        puts "ADDONS_APP_ID: #{@addons_app_id}"
+        puts "ADDONS_API_ID: #{@ADDONS_API_ID}"
         puts "ADDONS_APP_TOKEN: #{@addons_app_token}"
       end
 
@@ -42,7 +42,7 @@ module Addons
         if File.readlines(figaro).grep(/gem 'figaro'/).size == 0
           File.open(figaro, 'a') do |file|
             file.puts ""
-            file.puts "gem 'figaro' # Addons dependency"
+            file.puts "gem 'figaro', '~> 0.7.0' # Addons dependency"
           end
         end
 
@@ -57,7 +57,7 @@ module Addons
         # NOTE: 'w' overwrites the previous file!
         File.open(filename, 'w') do |file|
           # add new vars to application.yml for the restart
-          file.puts "ADDONS_APP_ID: #{@addons_app_id}"
+          file.puts "ADDONS_API_ID: #{@ADDONS_API_ID}"
           file.puts "ADDONS_APP_TOKEN: #{@addons_app_token}"
         end
 

data/lib/tasks/addons_recipe.rake

@@ -1,4 +1,5 @@
-require 'rest_client'
+require 'net/http'
+require 'open-uri'
 require 'json'
 
 require 'addons/recipes/types'
@@ -11,17 +12,24 @@ namespace :addons do
     desc "Run a recipe by name"
     task :run, :recipe_handle do |t, args|
       recipes = nil
-      recipeUrl = "https://launchpack.io/api/v1/apps/recipes?app_id=#{ENV['ADDONS_APP_ID']}&app_token=#{ENV['ADDONS_APP_TOKEN']}"
+      recipeUrl = "https://addonlist.com/api/v1/addons/apps/recipes?source=rubygem"
 
-      response = RestClient.get recipeUrl
-      recipes = JSON.parse response.body
+      uri = URI.parse(recipeUrl)
+
+      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'])
+      response = http.request(request).body
+
+      recipes = JSON.parse response
 
       # parse instructions into ruby
       recipes.each { |recipe| recipe["instructions"] = JSON.parse(recipe["instructions"]) }
 
       @run = false
       if "all" == args[:recipe_handle]
-        puts "Running all your Launchpack.io recipes"
+        puts "Running all your AddonList recipes"
 
         recipes.each do |recipe|
           Addons::Recipe.run recipe

data/spec/addons_spec.rb

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

metadata

@@ -1,111 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: addons
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Addonlist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rest_client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: figaro
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
 description: Connect your app to Addons for all your service integrations in one place.
@@ -115,7 +101,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -133,7 +119,7 @@ files:
 - lib/generators/addons/install_generator.rb
 - lib/tasks/addons_recipe.rake
 - spec/addons_spec.rb
-homepage: ''
+homepage: https://github.com/addonlist/addons-gem
 licenses:
 - MIT
 metadata: {}
@@ -143,21 +129,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+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_APP_ID'] and ENV['ADDONS_APP_TOKEN']), the gem will pull your services
+  (ENV['ADDONS_API_ID'] and ENV['ADDONS_APP_TOKEN']), the gem will pull your services
   config and set them up for immediate use.
 test_files:
 - spec/addons_spec.rb