confyio 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 639af2dec4aaf421b6d016f8463dab340383fe1f
-  data.tar.gz: 2d820b39bb1860f009291e418b2c832df001c044
+  metadata.gz: 77ed0ba6c5ab8d60c7c39c315413f72b130f9f7b
+  data.tar.gz: f33fabe1345355b732028fcdcaf8319b06d37d28
 SHA512:
-  metadata.gz: 00d3892daec80f5552f41f1d28d00491febfe4887c2563414fc212163191163873a9fbf9105db7f111d70ca8416efb274dbd023e578c1304063b935fbb9b84ca
-  data.tar.gz: 1c0374d9dd59cbf13bd0a38d5f396aead590a3119d9de9ca9b0085b15d3ff6f818dbccde35e72df053e4cef6d9c822969ec8cfeb6a0ca81e3e177907541a5612
+  metadata.gz: 8e588a7f0a687049eacc1b0ee268f4d6ba6d2e198b2c8faecb27acbe7bad8bc27a55c8c4d17543cc7d944763ee91c665df640b5269645955cbcb70dd1901d1c1
+  data.tar.gz: e2133bb0a2fef3a09a08c104dc9336e68f13907c29e498e0febf12819807fd9d029778f52dc32d1f18641811221adb8dfb3974f04a2b3c5bde2cef54d83445e5

data/lib/confy/api/access.rb

@@ -2,7 +2,7 @@ module Confy
 
   module Api
 
-    # List of teams who has access to the project. Default team __Owners__ will have access to every project. Authenticated user should be the owner of the organization for the below endpoints.
+    # List of teams whic have access to the project. Default team __Owners__ will have access to every project. Authenticated user should be the owner of the organization for the below endpoints.
     #
     # org - Name of the organization
     # project - Name of the project
@@ -14,7 +14,16 @@ module Confy
         @client = client
       end
 
-      # Give the team access to the given project. The __team__ in the request needs to be a string.
+      # Retrieve a list of teams which have access to the given project. Authenticated user should be a member of the team.
+      #
+      # '/orgs/:org/projects/:project/access' GET
+      def list(options = {})
+        body = options.fetch(:query, {})
+
+        @client.get("/orgs/#{@org}/projects/#{@project}/access", body, options)
+      end
+
+      # Give the team access to the given project. The __team__ in the request needs to be a string and should be the name of a valid team. Authenticated user should be the owner of the organization.
       #
       # '/orgs/:org/projects/:project/access' POST
       #
@@ -26,7 +35,7 @@ module Confy
         @client.post("/orgs/#{@org}/projects/#{@project}/access", body, options)
       end
 
-      # Remove project access for the given team. The __team__ in the request needs to be a string. Can't delete default team's access.
+      # Remove project access for the given team. The __team__ in the request needs to be a string and should be the name of a valid team. Can't delete default team's access. Authenticated user should be the owner of the organization.
       #
       # '/orgs/:org/projects/:project/access' DELETE
       #

data/lib/confy/api/config.rb

@@ -16,7 +16,7 @@ module Confy
         @client = client
       end
 
-      # Get an environment config of the project.
+      # Get an environment configuration
       #
       # '/orgs/:org/projects/:project/envs/:env/config' GET
       def retrieve(options = {})
@@ -29,11 +29,23 @@ module Confy
       #
       # '/orgs/:org/projects/:project/envs/:env/config' PATCH
       #
-      # body - Configuration to update
-      def update(body, options = {})
+      # config - Configuration to update
+      def update(config, options = {})
+        body = options.fetch(:body, {})
+        body[:config] = config
+
         @client.patch("/orgs/#{@org}/projects/#{@project}/envs/#{@env}/config", body, options)
       end
 
+      # List the last 10 versions of the environment configuration
+      #
+      # '/orgs/:org/projects/:project/envs/:env/versions' GET
+      def versions(options = {})
+        body = options.fetch(:query, {})
+
+        @client.get("/orgs/#{@org}/projects/#{@project}/envs/#{@env}/versions", body, options)
+      end
+
     end
 
   end

data/lib/confy/api/envs.rb

@@ -2,7 +2,7 @@ module Confy
 
   module Api
 
-    # Every project has a default environment named Production. Each environment has one configuration document which can have many keys and values.
+    # Every project has a default environment named Production. Each environment has __one__ configuration document which can have many keys and values.
     #
     # org - Name of the organization
     # project - Name of the project
@@ -14,7 +14,7 @@ module Confy
         @client = client
       end
 
-      # List all the environmens of the project which can be seen by the authenticated user.
+      # List all the environmens of the project. The authenticated user should have access to the project.
       #
       # '/orgs/:org/projects/:project/envs' GET
       def list(options = {})
@@ -23,7 +23,7 @@ module Confy
         @client.get("/orgs/#{@org}/projects/#{@project}/envs", body, options)
       end
 
-      # Create an environment for the given project. Authenticated user should have access to the project.
+      # Create an environment. The authenticated user should have access to the project.
       #
       # '/orgs/:org/projects/:project/envs' POST
       #
@@ -37,7 +37,7 @@ module Confy
         @client.post("/orgs/#{@org}/projects/#{@project}/envs", body, options)
       end
 
-      # Get an environment of the project the user has access to.
+      # Get the given environment in the given project. The authenticated user should have access to the project.
       #
       # '/orgs/:org/projects/:project/envs/:env' GET
       #
@@ -48,7 +48,7 @@ module Confy
         @client.get("/orgs/#{@org}/projects/#{@project}/envs/#{env}", body, options)
       end
 
-      # Update an environment. Authenticated user should have access to the project.
+      # Update the given environment. __Description__ is the only thing which can be updated. Authenticated user should have access to the project.
       #
       # '/orgs/:org/projects/:project/envs/:env' PATCH
       #
@@ -61,7 +61,7 @@ module Confy
         @client.patch("/orgs/#{@org}/projects/#{@project}/envs/#{env}", body, options)
       end
 
-      # Delete the given environment of the project. Authenticated user should have access to the project. Cannot delete the default environment.
+      # Delete the given environment. Authenticated user should have access to the project. Cannot delete the default environment.
       #
       # '/orgs/:org/projects/:project/envs/:env' DELETE
       #

data/lib/confy/api/members.rb

@@ -14,7 +14,16 @@ module Confy
         @client = client
       end
 
-      # Add the user to the given team. The __user__ in the request needs to be a string.
+      # List all the members in the given team. Authenticated user should be a member of the team or the owner of the org.
+      #
+      # '/orgs/:org/teams/:team/member' GET
+      def list(options = {})
+        body = options.fetch(:query, {})
+
+        @client.get("/orgs/#{@org}/teams/#{@team}/member", body, options)
+      end
+
+      # Add the user to the given team. The __user__ in the request needs to be a string and be the username of a valid user.  The Authenticated user should be the owner of the organization.
       #
       # '/orgs/:org/teams/:team/member' POST
       #
@@ -26,7 +35,7 @@ module Confy
         @client.post("/orgs/#{@org}/teams/#{@team}/member", body, options)
       end
 
-      # Remove users from the given team. The __user__ in the request needs to be a string. Cannot delete the default member in a team.
+      # Remove users from the given team. The __user__ in the request needs to be a string and be the username of a valid user. Cannot delete the default member in a team.  The Authenticated user should be the owner of the organization.
       #
       # '/orgs/:org/teams/:team/member' DELETE
       #

data/lib/confy/api/orgs.rb

@@ -18,21 +18,7 @@ module Confy
         @client.get("/orgs", body, options)
       end
 
-      # Create an organization with a name and the email for billing.
-      #
-      # '/orgs' POST
-      #
-      # name - Name of the organization
-      # email - Billing email of the organization
-      def create(name, email, options = {})
-        body = options.fetch(:body, {})
-        body[:name] = name
-        body[:email] = email
-
-        @client.post("/orgs", body, options)
-      end
-
-      # Get an organization the user has access to.
+      # Get the given organization if the authenticated user is a member.
       #
       # '/orgs/:org' GET
       #
@@ -43,7 +29,7 @@ module Confy
         @client.get("/orgs/#{org}", body, options)
       end
 
-      # Update an organization the user is owner of.
+      # Update the given organization if the authenticated user is the owner. __Email__ is the only thing which can be updated.
       #
       # '/orgs/:org' PATCH
       #

data/lib/confy/api/projects.rb

@@ -12,7 +12,7 @@ module Confy
         @client = client
       end
 
-      # List all the projects of the organization which can be seen by the authenticated user.
+      # List all the projects of the given organization which can be accessed by the authenticated user.
       #
       # '/orgs/:org/projects' GET
       def list(options = {})
@@ -21,7 +21,7 @@ module Confy
         @client.get("/orgs/#{@org}/projects", body, options)
       end
 
-      # Create a project for the given organization. Authenticated user should be the owner of the organization.
+      # Create a project if the authenticated user is the owner of the given organization. Only the __owners__ team will be able to see the project initially.
       #
       # '/orgs/:org/projects' POST
       #
@@ -35,7 +35,7 @@ module Confy
         @client.post("/orgs/#{@org}/projects", body, options)
       end
 
-      # Get a project the user has access to.
+      # Get the given project in the given organization. Works only if the authenticated user has access to the project.
       #
       # '/orgs/:org/projects/:project' GET
       #
@@ -46,7 +46,7 @@ module Confy
         @client.get("/orgs/#{@org}/projects/#{project}", body, options)
       end
 
-      # Update a project. Authenticated user should be the owner of the organization.
+      # Update the given project. __Description__ is the only thing which can be updated. Authenticated user should be the owner of the organization.
       #
       # '/orgs/:org/projects/:project' PATCH
       #
@@ -59,7 +59,7 @@ module Confy
         @client.patch("/orgs/#{@org}/projects/#{project}", body, options)
       end
 
-      # Delete the given project. Cannot delete the default project in the organization. Authenticated user should be the owner of the organization.
+      # Delete the given project. Authenticated user should be the owner of the organization.
       #
       # '/orgs/:org/projects/:project' DELETE
       #

data/lib/confy/api/teams.rb

@@ -2,7 +2,7 @@ module Confy
 
   module Api
 
-    # Every organization will have a default team named Owners. Owner of the organization will be a default member for every team.
+    # Every organization will have a default team named __Owners__. Owner of the organization will be a default member for every team.
     #
     # org - Name of the organization
     class Teams
@@ -35,7 +35,7 @@ module Confy
         @client.post("/orgs/#{@org}/teams", body, options)
       end
 
-      # Get a team the user is member of.
+      # Get the given team in the given organization. Access only if the authenticated user is a member of the team.
       #
       # '/orgs/:org/teams/:team' GET
       #
@@ -46,7 +46,7 @@ module Confy
         @client.get("/orgs/#{@org}/teams/#{team}", body, options)
       end
 
-      # Update a team. Authenticated user should be the owner of the organization.
+      # Update the given team. __Description__ is the only thing which can be updated. Authenticated user should be the owner of the organization.
       #
       # '/orgs/:org/teams/:team' PATCH
       #
@@ -70,6 +70,17 @@ module Confy
         @client.delete("/orgs/#{@org}/teams/#{team}", body, options)
       end
 
+      # Retrieve the list of projects the given team has access to. Authenticated user should be a member of the team.
+      #
+      # '/orgs/:org/teams/:team/projects' GET
+      #
+      # team - Name of the team
+      def projects(team, options = {})
+        body = options.fetch(:query, {})
+
+        @client.get("/orgs/#{@org}/teams/#{team}/projects", body, options)
+      end
+
     end
 
   end

data/lib/confy/api/user.rb

@@ -18,14 +18,12 @@ module Confy
         @client.get("/user", body, options)
       end
 
-      # Update the authenticated user's profile
+      # Update the authenticated user's profile. Should use basic authentication.
       #
       # '/user' PATCH
       #
-      # email - Profile email of the user
-      def update(email, options = {})
+      def update(options = {})
         body = options.fetch(:body, {})
-        body[:email] = email
 
         @client.patch("/user", body, options)
       end

data/lib/confy/client.rb

@@ -28,7 +28,7 @@ module Confy
       Confy::Api::Orgs.new(@http_client)
     end
 
-    # Every organization will have a default team named Owners. Owner of the organization will be a default member for every team.
+    # Every organization will have a default team named __Owners__. Owner of the organization will be a default member for every team.
     #
     # org - Name of the organization
     def teams(org)
@@ -50,7 +50,7 @@ module Confy
       Confy::Api::Projects.new(org, @http_client)
     end
 
-    # List of teams who has access to the project. Default team __Owners__ will have access to every project. Authenticated user should be the owner of the organization for the below endpoints.
+    # List of teams whic have access to the project. Default team __Owners__ will have access to every project. Authenticated user should be the owner of the organization for the below endpoints.
     #
     # org - Name of the organization
     # project - Name of the project
@@ -58,7 +58,7 @@ module Confy
       Confy::Api::Access.new(org, project, @http_client)
     end
 
-    # Every project has a default environment named Production. Each environment has one configuration document which can have many keys and values.
+    # Every project has a default environment named Production. Each environment has __one__ configuration document which can have many keys and values.
     #
     # org - Name of the organization
     # project - Name of the project

data/lib/confy/config.rb

@@ -1,25 +1,58 @@
+require "json"
+require "openssl"
+require "digest/md5"
+require "base64"
+
 module Confy
 
   class Config
 
     def self.load(url = {})
       if url.is_a?(String)
-        regex = Regexp.new('(https?:\/\/)(.*):(.*)@(.*)\/orgs\/([a-z0-9]*)\/projects\/([a-z0-9]*)\/envs\/([a-z0-9]*)\/config', true)
-        matches = regex.match(url)
+        name_regex = '([a-z0-9][a-z0-9-]*[a-z0-9])'
+        path_regex = 'orgs\\/' + name_regex + '\\/projects\\/' + name_regex + '\\/envs\\/' + name_regex
+        url_regex = Regexp.new('(https?:\\/\\/)(.*):(.*)@(.*)\\/(' + path_regex + '|heroku)\\/config', true)
+
+        matches = url_regex.match(url)
 
         raise 'Invalid url' if matches.nil?
 
         url = {
-          :host => matches[1] + matches[4], :user => matches[2], :pass => matches[3],
-          :org => matches[5], :project => matches[6], :env => matches[7]
+          :host => matches[1] + matches[4], :path => "/#{matches[5]}/config",
+          :user => matches[2], :pass => matches[3]
         }
       end
 
+      raise 'Invalid url' if !url.is_a?(Hash)
+
       client = Confy::Client.new({
         :username => url[:user], :password => url[:pass]
       }, { :base => url[:host] })
 
-      client.config(url[:org], url[:project], url[:env]).retrieve().body
+      body = client.instance_variable_get(:@http_client).get(url[:path]).body
+
+      return body if body.is_a?(Hash)
+
+      decryptPass = ENV['CONFY_DECRYPT_PASS']
+
+      raise 'Invalid credential document' if !body.is_a?(String)
+      raise 'No decryption password found. Fill env var CONFY_DECRYPT_PASS' if decryptPass.nil?
+
+      # Strip quotes
+      body = body[1..-2] if body[0] == '"' and body[-1] == '"'
+
+      cipher = OpenSSL::Cipher::Cipher.new('aes-256-cbc')
+      cipher.decrypt
+      cipher.iv = Base64.decode64(body[0..23])
+      cipher.key = Digest::MD5.hexdigest(decryptPass)
+
+      decrypted = cipher.update(Base64.decode64(body[24..-1])) + cipher.final
+
+      begin
+        body = JSON.parse(decrypted)
+      rescue JSON::ParserError
+        raise 'Decryption password is wrong'
+      end
     end
 
     def self.env(url = {})

data/lib/confy/http_client/auth_handler.rb

@@ -46,7 +46,7 @@ module Confy
 
       # Basic Authorization with username and password
       def http_password(env)
-        code = Base64.encode64 "#{@auth[:username]}:#{@auth[:password]}"
+        code = Base64.strict_encode64 "#{@auth[:username]}:#{@auth[:password]}"
 
         env[:request_headers]["Authorization"] = "Basic #{code}"
 

data/lib/confy/http_client/error_handler.rb

@@ -27,7 +27,7 @@ module Confy
             end
 
             # If JSON, a particular field is taken and used
-            if type.include?("json") and body.is_a?(Hash)
+            if type and type.include?("json") and body.is_a?(Hash)
               if body.has_key?("message")
                 message = body["message"]
               else

data/lib/confy/http_client/response_handler.rb

@@ -10,8 +10,12 @@ module Confy
         body = response.body
 
         # Response body is in JSON
-        if type.include?("json")
-          body = JSON.parse body
+        if type and type.include?("json")
+          begin
+            body = JSON.parse body
+          rescue JSON::ParserError
+            return body
+          end
         end
 
         return body

data/lib/confy/version.rb

@@ -0,0 +1,3 @@
+module Confy
+  VERSION = "2.0.0"
+end

data/lib/confyio.rb

@@ -1,5 +1,6 @@
 require "rubygems"
 
+require "confy/version"
 require "confy/client"
 require "confy/config"
 require "confy/error"

metadata

@@ -1,41 +1,53 @@
 --- !ruby/object:Gem::Specification
 name: confyio
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Pavan Kumar Sunkara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-18 00:00:00.000000000 Z
+date: 2015-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.7
 description: Official Confy API library client for ruby
@@ -44,24 +56,25 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/confy/http_client/response_handler.rb
-- lib/confy/http_client/request_handler.rb
-- lib/confy/http_client/response.rb
-- lib/confy/http_client/error_handler.rb
-- lib/confy/http_client/auth_handler.rb
 - lib/confy/api/access.rb
-- lib/confy/api/envs.rb
-- lib/confy/api/teams.rb
 - lib/confy/api/config.rb
-- lib/confy/api/projects.rb
+- lib/confy/api/envs.rb
 - lib/confy/api/members.rb
 - lib/confy/api/orgs.rb
+- lib/confy/api/projects.rb
+- lib/confy/api/teams.rb
 - lib/confy/api/user.rb
-- lib/confy/http_client.rb
 - lib/confy/client.rb
-- lib/confy/error/client_error.rb
 - lib/confy/config.rb
 - lib/confy/error.rb
+- lib/confy/error/client_error.rb
+- lib/confy/http_client.rb
+- lib/confy/http_client/auth_handler.rb
+- lib/confy/http_client/error_handler.rb
+- lib/confy/http_client/request_handler.rb
+- lib/confy/http_client/response.rb
+- lib/confy/http_client/response_handler.rb
+- lib/confy/version.rb
 - lib/confyio.rb
 homepage: https://confy.io
 licenses:
@@ -73,18 +86,19 @@ 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.1.11
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Official Confy API library client for ruby
 test_files: []
+has_rdoc: