singularity_client 0.3.0 → 1.0.0

data/lib/singularity_client/api.rb

@@ -8,27 +8,28 @@ require 'singularity_client/request'
 module SingularityClient
   # Handles the singularity api
   class API
-    def self.config(config)
-      endpoint = 'config'
-
-      request = SingularityClient::Request.new(config)
-      response = request.get(endpoint)
-
-      pp(JSON.parse(response.body))
-    end
+    # def self.config(config)
+    #   endpoint = 'config'
+    #
+    #   request = SingularityClient::Request.new(config)
+    #   response = request.get(endpoint)
+    #
+    #   pp(JSON.parse(response.body))
+    # end
 
     ##
     # Add to the singularity config
     # the 'type' parameter can be pull_request or push
     #
     def self.add(config, repo, project, type)
-      # This is just to maintain backwards compatability
-      type ||= 'pull_request'
+      unless type == 'proposal' || type == 'change'
+        fail("ERROR invalid type: #{type}. \
+              Valid types are \'proposal\' or \'change\'")
+      end
 
-      endpoint = (type == 'push') ? 'config/push' : 'config/pull_request'
+      endpoint = "config/#{type}"
       post_data = {
-        organization: config.organization,
-        repo: repo,
+        repository: "#{config.organization}/#{repo}",
         project: project
       }
 
@@ -38,23 +39,40 @@ module SingularityClient
       puts('success!')
     end
 
-    def self.comment(config, repo, pr, comment)
-      # if pr is not a number, pr.to_i will return 0
-      # zero is not a valid pull-request identifier
-      fail('ERROR invalid pull-request provided') if pr.to_i == 0
+    ##
+    # Remove a repository from the singularity config
+    #
+    def self.remove(config, repo)
+      endpoint = 'config/repo'
 
-      endpoint = 'comment'
       post_data = {
-        organization: config.organization,
-        repo: repo,
-        pull_request: pr,
-        message: comment
+        repository: "#{config.organization}/#{repo}"
       }
 
       request = SingularityClient::Request.new(config)
-      request.post(endpoint, post_data)
+      request.delete(endpoint, post_data)
 
       puts('success!')
     end
+
+    # Does this still exist?
+    # def self.comment(config, repo, pr, comment)
+    #   # if pr is not a number, pr.to_i will return 0
+    #   # zero is not a valid pull-request identifier
+    #   fail('ERROR invalid pull-request provided') if pr.to_i == 0
+    #
+    #   endpoint = 'comment'
+    #   post_data = {
+    #     organization: config.organization,
+    #     repo: repo,
+    #     pull_request: pr,
+    #     message: comment
+    #   }
+    #
+    #   request = SingularityClient::Request.new(config)
+    #   request.post(endpoint, post_data)
+    #
+    #   puts('success!')
+    # end
   end
 end

data/lib/singularity_client/cli.rb

@@ -23,41 +23,48 @@ module SingularityClient
     class_option :debug, aliases: '-d', type: :boolean,
       desc: 'Turn on debug mode'
 
-    desc 'config', 'Get the current singularity config object'
-    def config
-      run(:config)
-    end
+    # desc 'config', 'Get the current singularity config object'
+    # def config
+    #   run(:config)
+    # end
 
     desc 'add REPO_NAME PROJECT_NAME', 'Add a github repository to singularity'
     long_desc 'This will add both pull requests, and pushes, to singularity'
     method_option :github_organization, aliases: '-o', type: :string,
       desc: 'Override the default github organization'
     def add(repo, project)
-      run(:add, repo, project, 'pull_request')
-      run(:add, repo, project, 'push')
+      run(:add, repo, project, 'proposal')
+      run(:add, repo, project, 'change')
     end
 
-    desc 'addPull REPO_NAME PROJECT_NAME', 'Add repo pulls to singularity'
+    desc 'add_pull REPO_NAME PROJECT_NAME', 'Add repo pulls to singularity'
     method_option :github_organization, aliases: '-o', type: :string,
       desc: 'Override the default github organization'
     def add_pull(repo, project)
-      run(:add, repo, project, 'pull_request')
+      run(:add, repo, project, 'proposal')
     end
 
-    desc 'addPush REPO_NAME PROJECT_NAME', 'Add repo pushes to singularity'
+    desc 'add_push REPO_NAME PROJECT_NAME', 'Add repo pushes to singularity'
     method_option :github_organization, aliases: '-o', type: :string,
       desc: 'Override the default github organization'
     def add_push(repo, project)
-      run(:add, repo, project, 'push')
+      run(:add, repo, project, 'change')
     end
 
-    desc 'comment REPO_NAME PR_NUM COMMENT', 'Write comment to a pull request'
+    desc 'remove_repo REPO_NAME', 'Remove a repository from the config'
     method_option :github_organization, aliases: '-o', type: :string,
       desc: 'Override the default github organization'
-    def comment(repo, pr, comment)
-      run(:comment, repo, pr, comment)
+    def remove_repo(repo)
+      run(:remove, repo)
     end
 
+    # desc 'comment REPO_NAME PR_NUM COMMENT', 'Write comment to a pull request'
+    # method_option :github_organization, aliases: '-o', type: :string,
+    #   desc: 'Override the default github organization'
+    # def comment(repo, pr, comment)
+    #   run(:comment, repo, pr, comment)
+    # end
+
     private
 
     def run(action, *args)

data/lib/singularity_client/request.rb

@@ -31,6 +31,16 @@ module SingularityClient
       response.code == 200 ? response : error(response)
     end
 
+    def delete(endpoint, data = {})
+      request = "#{@base_uri}/#{endpoint}"
+      puts "DEBUG: sending delete request to #{request}" if @debug
+      puts "DEBUG: with data #{data}" if @debug
+
+      response = self.class.delete(request, body: data)
+
+      response.code == 200 ? response : error(response)
+    end
+
     private
 
     def error(response)

data/lib/singularity_client/version.rb

@@ -2,5 +2,5 @@
 
 # Version
 module SingularityClient
-  VERSION = '0.3.0'
+  VERSION = '1.0.0'
 end

data/spec/singularity_client/api_spec.rb

@@ -12,37 +12,37 @@ describe SingularityClient::API do
     )
   end
 
-  describe '.config' do
-    subject(:config) { SingularityClient::API.config(config_obj) }
-
-    describe 'when it receives a succesful response' do
-      it 'it parses and displays the config' do
-        expected_response = {
-          'github' => {
-            'ci_user' => 'bejudged',
-            'repositories' => %w(aws bevarnish)
-          },
-          'jenkins' => {
-            'has_global_trigger_token' => true,
-            'projects' => [{
-              'name' => 'branch-cookbook-aws',
-              'repo' => 'aws',
-              'has_trigger_token' => true
-            }, {
-              'name' => 'branch-cookbook-bevarnish',
-              'repo' => 'bevarnish',
-              'has_trigger_token' => false
-            }],
-            'push_projects' => []
-          }
-        }
-
-        VCR.use_cassette('config') do
-          expect(config).to eq(expected_response)
-        end
-      end
-    end
-  end
+  # describe '.config' do
+  #   subject(:config) { SingularityClient::API.config(config_obj) }
+  #
+  #   describe 'when it receives a succesful response' do
+  #     it 'it parses and displays the config' do
+  #       expected_response = {
+  #         'github' => {
+  #           'ci_user' => 'bejudged',
+  #           'repositories' => %w(aws bevarnish)
+  #         },
+  #         'jenkins' => {
+  #           'has_global_trigger_token' => true,
+  #           'projects' => [{
+  #             'name' => 'branch-cookbook-aws',
+  #             'repo' => 'aws',
+  #             'has_trigger_token' => true
+  #           }, {
+  #             'name' => 'branch-cookbook-bevarnish',
+  #             'repo' => 'bevarnish',
+  #             'has_trigger_token' => false
+  #           }],
+  #           'push_projects' => []
+  #         }
+  #       }
+  #
+  #       VCR.use_cassette('config') do
+  #         expect(config).to eq(expected_response)
+  #       end
+  #     end
+  #   end
+  # end
 
   describe '.add' do
 
@@ -51,13 +51,13 @@ describe SingularityClient::API do
         SingularityClient::API.add(config_obj,
                                    'test_repo',
                                    'test_project',
-                                   'pull_request'
+                                   'proposal'
         )
       end
 
       describe 'when it receives a succesful response' do
         it 'it returns success!' do
-          VCR.use_cassette('addPull') do
+          VCR.use_cassette('addProposal') do
             expect(STDOUT).to receive(:puts).with('success!')
             add
           end
@@ -70,34 +70,51 @@ describe SingularityClient::API do
         SingularityClient::API.add(config_obj,
                                    'test_repo',
                                    'test_project',
-                                   'push'
+                                   'change'
         )
       end
 
       describe 'when it receives a succesful response' do
         it 'it returns success!' do
-          VCR.use_cassette('addPush') do
+          VCR.use_cassette('addChange') do
             expect(STDOUT).to receive(:puts).with('success!')
             add
           end
         end
       end
     end
-  end
 
-  describe '.comment' do
-    subject(:comment) do
-      comment = 'This is some test comment'
-      SingularityClient::API.comment(config_obj, 'test_repo', '12', comment)
-    end
+    describe '.remove' do
+      subject(:remove) do
+        SingularityClient::API.remove(config_obj,
+                                      'test_repo'
+        )
+      end
 
-    describe 'when it receives a succesful response' do
-      it 'it returns success!' do
-        VCR.use_cassette('comment') do
-          expect(STDOUT).to receive(:puts).with('success!')
-          comment
+      describe 'Delete a repo' do
+        it 'returns success!' do
+          VCR.use_cassette('removeRepo') do
+            expect(STDOUT).to receive(:puts).with('success!')
+            remove
+          end
         end
       end
     end
   end
+
+  # describe '.comment' do
+  #   subject(:comment) do
+  #     comment = 'This is some test comment'
+  #     SingularityClient::API.comment(config_obj, 'test_repo', '12', comment)
+  #   end
+  #
+  #   describe 'when it receives a succesful response' do
+  #     it 'it returns success!' do
+  #       VCR.use_cassette('comment') do
+  #         expect(STDOUT).to receive(:puts).with('success!')
+  #         comment
+  #       end
+  #     end
+  #   end
+  # end
 end

data/spec/vcr_cassettes/{addPush.yml → addChange.yml}

@@ -2,10 +2,10 @@
 http_interactions:
 - request:
     method: post
-    uri: http://mergeatron.dev-be-aws.net:3306/config/push
+    uri: http://mergeatron.dev-be-aws.net:3306/config/change
     body:
       encoding: US-ASCII
-      string: organization=some_org&repo=test_repo&project=test_project
+      string: repository=some_org/test_repo&project=test_project
     headers: {}
   response:
     status:

data/spec/vcr_cassettes/{addPull.yml → addProposal.yml}

@@ -2,10 +2,10 @@
 http_interactions:
 - request:
     method: post
-    uri: http://mergeatron.dev-be-aws.net:3306/config/pull_request
+    uri: http://mergeatron.dev-be-aws.net:3306/config/proposal
     body:
       encoding: US-ASCII
-      string: organization=some_org&repo=test_repo&project=test_project
+      string: repository=some_org/test_repo&project=test_project
     headers: {}
   response:
     status:

data/spec/vcr_cassettes/removeRepo.yml

@@ -0,0 +1,30 @@
+---
+http_interactions:
+- request:
+    method: delete
+    uri: http://mergeatron.dev-be-aws.net:3306/config/repo
+    body:
+      encoding: US-ASCII
+      string: repository=some_org/test_repo
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Powered-By:
+      - Express
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '16'
+      Date:
+      - Wed, 18 Jun 2014 22:58:24 GMT
+      Connection:
+      - keep-alive
+    body:
+      encoding: US-ASCII
+      string: ! '{"success":true}'
+    http_version:
+  recorded_at: Wed, 18 Jun 2014 22:58:23 GMT
+recorded_with: VCR 2.9.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: singularity_client
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -184,12 +184,13 @@ files:
 - spec/singularity_client/config_spec.rb
 - spec/singularity_client/request_spec.rb
 - spec/spec_helper.rb
-- spec/vcr_cassettes/addPull.yml
-- spec/vcr_cassettes/addPush.yml
+- spec/vcr_cassettes/addChange.yml
+- spec/vcr_cassettes/addProposal.yml
 - spec/vcr_cassettes/comment.yml
 - spec/vcr_cassettes/config.yml
 - spec/vcr_cassettes/error-get.yml
 - spec/vcr_cassettes/error-post.yml
+- spec/vcr_cassettes/removeRepo.yml
 homepage: ''
 licenses:
 - MIT
@@ -205,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3052736762778204807
+      hash: 1881409474290039325
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -214,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3052736762778204807
+      hash: 1881409474290039325
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -227,9 +228,10 @@ test_files:
 - spec/singularity_client/config_spec.rb
 - spec/singularity_client/request_spec.rb
 - spec/spec_helper.rb
-- spec/vcr_cassettes/addPull.yml
-- spec/vcr_cassettes/addPush.yml
+- spec/vcr_cassettes/addChange.yml
+- spec/vcr_cassettes/addProposal.yml
 - spec/vcr_cassettes/comment.yml
 - spec/vcr_cassettes/config.yml
 - spec/vcr_cassettes/error-get.yml
 - spec/vcr_cassettes/error-post.yml
+- spec/vcr_cassettes/removeRepo.yml