ruby-cute 0.12 → 0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4fa0a0d9d7a8e3f7cfd35add2bc9e4404329a516
-  data.tar.gz: faa35626a2faa2da58202c7fb4e1633e39bf0ad5
+SHA256:
+  metadata.gz: d49efb970f8f16ed726038af0c0b7ff4a784ef6224b9f9c93be5da2b9e45ab54
+  data.tar.gz: f852b0ef02f3e9c57d9ce9575cd3fa0ff9ce6992773068699f7e5de0851ecad7
 SHA512:
-  metadata.gz: d18ecc0aecbb55541f65c61749013ac9bd62a16e2a1b1005a67ed1e0577f0fee279408ed39f4406672137a02d1b1e24c51826328b1d733945cda677cd183e835
-  data.tar.gz: 1a2fa49eb86f36bb3fa39ef37ee24a8c4f2001f39ef02374b40bbca17da0cf6872ef6ce0196e49defe35fc912a1123f7bb094a52142dfed6bb1ec66e86298238
+  metadata.gz: 15dba2fa27ca9cb7c6f486d0580f9b872ec912e410557f3eb41f7bcc8f28625c6b841730e2b3d0c72858dc6c6e06aaf1f18e8d0f3a2a5fb7cbeb66742c3650f6
+  data.tar.gz: d7096e3d2730da5099159bbfc8869628d91e7e1f7583b5ba9a8c7db56ca5a02998342aa8aabcefe598939de10b64fb78d5b7aefac1eec608b287b4d7323911f3

data/.gitlab-ci.yml

@@ -0,0 +1,36 @@
+# This is important to avoid stale artifacts in the build directory
+variables:
+  GIT_STRATEGY: clone
+
+# Another stage is needed for the deployment (so that files are already generated by the previous job)
+stages:
+ - build
+ - deploy
+
+build:
+  stage: build
+  tags:
+   - grid5000-docker
+  image: debian:stretch
+  script:
+   - apt-get update && apt-get -y --no-install-recommends install devscripts build-essential equivs
+   - mk-build-deps -ir -t 'apt-get -y --no-install-recommends'
+   - dpkg-buildpackage
+   - cp ../*deb . # needed to upload it as artifact
+  except:
+     - tags
+  artifacts: # generate artifacts for files we want to publish
+     paths:
+      - ./*.deb
+     expire_in: '1 day'
+
+push-package:
+  stage: deploy
+  # tags must be 'packages' so that we use the runner on packages.grid5000.fr
+  tags:
+    - grid5000-packages
+  only:
+    - master
+  when: manual
+  script:
+    - g5k-deploy-files --only-if-tag --debian --directory deb/ruby-cute

data/debian/changelog

@@ -1,3 +1,15 @@
+ruby-cute (0.13) unstable; urgency=medium
+
+  * New release.
+
+ -- Lucas Nussbaum <lucas@debian.org>  Mon, 23 Mar 2020 21:03:21 +0100
+
+ruby-cute (0.12) unstable; urgency=medium
+
+  * New release.
+
+ -- Lucas Nussbaum <lucas@debian.org>  Thu, 24 Jan 2019 21:09:55 +0100
+
 ruby-cute (0.11) unstable; urgency=medium
 
   * New release.

data/lib/cute/g5k_api.rb

@@ -239,6 +239,12 @@ module Cute
       # @return [Hash] the HTTP response
       # @param path [String] this complements the URI to address to a specific resource
       def get_json(path)
+        return G5KJSON.parse(get_raw(path))
+      end
+      
+      # @return [String] the HTTP response
+      # @param path [String] this complements the URI to address to a specific resource
+      def get_raw(path)
         retries = 0
         begin
           r = resource(path).get(:content_type => "application/json",
@@ -253,7 +259,7 @@ module Cute
           end
           handle_exception(e)
         end
-        return G5KJSON.parse(r)
+        return r
       end
 
       # Creates a resource on the server

data/lib/cute/version.rb

@@ -1,3 +1,3 @@
 module Cute
-  VERSION = "0.12"
+  VERSION = "0.13"
 end

data/spec/g5k_api_spec.rb

@@ -69,12 +69,14 @@ describe Cute::G5K::API do
     expect(subject.get_deployments(@rand_site)).to be_an_instance_of(Cute::G5K::G5KArray)
   end
 
+=begin
   it "raises an authentication error" do
     expect{Cute::G5K::API.new(:user => "fake", :pass => "fake") }.to raise_error
   end
+=end
 
-  it "raises a non found error" do
-    expect{subject.get_jobs("non-found")}.to raise_error(Cute::G5K::NotFound)
+  it "raises a not found error" do
+    expect{subject.get_jobs("not-found")}.to raise_error(Cute::G5K::NotFound)
   end
 
   it "raises a bad request error" do
@@ -86,10 +88,10 @@ describe Cute::G5K::API do
     expect{subject.reserve(:site => @rand_site, :resources =>"nodes=1",:keys => "~/jobkey_nonexisting")}.to raise_error(Cute::G5K::BadRequest)
   end
 
-  it "raises an exception at deploying" do
-    expect{ subject.reserve(:site => @rand_site, :nodes => 1, :env => "nonsense")}.to raise_error(Cute::G5K::RequestFailed)
-  end
-
+#   it "raises an exception at deploying" do
+#     expect{ subject.reserve(:site => @rand_site, :nodes => 1, :env => "nonsense")}.to raise_error(Cute::G5K::RequestFailed)
+#   end
+# 
   it "raises argument errors" do
     job = Cute::G5K::G5KJSON.new
     expect {subject.deploy(:env => "env")}.to raise_error(ArgumentError)
@@ -185,10 +187,10 @@ describe Cute::G5K::API do
   end
 
 
-  it "submits a job and then deploy" do
-    expect(subject.reserve(:site => @rand_site, :env => @env)).to have_key("deploy")
-  end
-
+#  it "submits a job and then deploy" do
+#    expect(subject.reserve(:site => @rand_site, :env => @env)).to have_key("deploy")
+#  end
+#
 
   it "returns the same information" do
     #low level REST access

data/spec/spec_helper.rb

@@ -46,33 +46,36 @@ RSpec.configure do |config|
   # uri_sites = Addressable::Template.new "https://{user}:{password}@api.grid5000.fr/{version}/sites"
   config.before(:each) do
 
+    stub_request(:any,/^https:\/\/api.grid5000.fr\/.*/).
+      to_return(:status => 200, :body => g5k_media_type.to_json, :headers => {})
+
     stub_request(:any,/^https:\/\/.*\:.*@api.grid5000.fr\/.*/).
       to_return(:status => 200, :body => g5k_media_type.to_json, :headers => {})
 
     stub_request(:any,/^https:\/\/fake:fake@api.grid5000.fr\.*/).
       to_return(:status => 401)
 
-    stub_request(:any,/^https:\/\/.*\:.*@api.grid5000.fr\/...\/sites\/non-found\/.*/).
+    stub_request(:any,/^https:\/\/(.*\:.*@)?api.grid5000.fr\/.*\/sites\/not-found\/.*/).
       to_return(:status => 404)
 
-    stub_request(:any,/^https:\/\/.*\:.*@api.grid5000.fr\/...\/sites\/tmpfail\/.*/).
+    stub_request(:any,/^https:\/\/(.*\:.*@)?api.grid5000.fr\/.*\/sites\/tmpfail\/.*/).
       to_return(:status => 503).
       to_return(:status => 200, :body => g5k_media_type.to_json, :headers => {})
 
-    stub_request(:get,/^https:\/\/.*\:.*@api.grid5000.fr\/...\/sites\/.*vlans$/).
+    stub_request(:get,/^https:\/\/(.*\:.*@)?api.grid5000.fr\/.*\/sites\/.*vlans$/).
       to_return(:status => 200, :body => {'total' => 3, 'items' => [{'type' => "kavlan-local"},{'type' => "kvlan"}]}.to_json)
 
       # to_return(:status => 200, :body => {:total => 3, :items => [{:type => "kavlan-local"},{:type => "kavlan"}]})
 
-    stub_request(:post, /^https:\/\/.*\:.*@api.grid5000.fr\/.*/).
+    stub_request(:post, /^https:\/\/(.*\:.*@)?api.grid5000.fr\/.*/).
       with(:body => hash_including("resources" => "/slash_22=1+{nonsense},walltime=01:00")).
       to_return(:status => 400, :body => "Oarsub failed: please verify your request syntax")
 
-    stub_request(:post, /^https:\/\/.*\:.*@api.grid5000.fr\/.*/).
+    stub_request(:post, /^https:\/\/(.*\:.*@)?api.grid5000.fr\/.*/).
       with(:body => hash_including("import-job-key-from-file" => [ File.expand_path("~/jobkey_nonexisting") ])).
       to_return(:status => 400, :body => "Oarsub failed: please verify your request syntax")
 
-    stub_request(:post, /^https:\/\/.*\:.*@api.grid5000.fr\/.*/).
+    stub_request(:post, /^https:\/\/(.*\:.*@)?api.grid5000.fr\/.*/).
       with(:body => hash_including("environment" => "nonsense")).
       to_return(:status => 500, :body => "Invalid environment specification")
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-cute
 version: !ruby/object:Gem::Version
-  version: '0.12'
+  version: '0.13'
 platform: ruby
 authors:
 - Algorille team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-21 00:00:00.000000000 Z
+date: 2020-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -174,6 +174,7 @@ extra_rdoc_files:
 - LICENSE
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".yardopts"
 - Gemfile
 - LICENSE
@@ -235,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Critically Useful Tools for Experiments