cirneco 0.7 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 016cd10312936fb3ff586472a6aedd2f497ef682
-  data.tar.gz: bb9e4403195692a0e82ffc877f6b988ea1b1a05a
+  metadata.gz: c8a8e700d7b0dd87587e3807300302bcc19fbccb
+  data.tar.gz: 943cab2ad20fbe4b4be178665f3dfd37544e117c
 SHA512:
-  metadata.gz: 2bdb1e1062c2b52b03e76049cb1053199b3391b61cd0309296c7ae3f758ac82a4a1c4cbdb7d4842e5dcd7aa83fca5155bc5e63d763ab697c9f4de027851a77e0
-  data.tar.gz: 17d73fa3880aac9563b003ec38d4ba42bc5c666d3255a47fc74336bffc5fa5e904a3245c8583a212d5cab5cc05a24b0ccfea4be06ca2453bb77ca31bd1f62916
+  metadata.gz: 8de5fba5d1bd0c5fdf83fe9710c7a02ac53b6c2c9d746afa40a8035eec01da0346871fd704015fce1fb3dfe762f1814ffb23fd81148538f7d7092cf9bc861c2f
+  data.tar.gz: 8b9c3d3b14a82160c18a59a465a394152e6447f27431f3b3aa2e50b935c7f80abaeac6b10e3e42e43c9a9ac6eb3f4455f85adf35f7f075d6e0e56a04984fa3bf

data/.env.example

@@ -1,6 +1,5 @@
 MDS_USERNAME=USER.USER
 MDS_PASSWORD=opensesame
-SANDBOX=1
 PREFIX=10.5072
 
 SITE_URL=https://blog.datacite.org/

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cirneco (0.7)
+    cirneco (0.7.1)
       activesupport (~> 4.2, >= 4.2.5)
       base32-crockford-checksum (~> 0.2.2)
       bergamasco (~> 0.2)

data/Rakefile

@@ -8,24 +8,5 @@ require 'rspec/core/rake_task'
 Bundler::GemHelper.install_tasks
 RSpec::Core::RakeTask.new('spec')
 
-namespace :repo do
-  desc "push files generated with cirneco to remote"
-  task :push do
-
-    # Configure git if this is run in Travis CI
-    if ENV["TRAVIS"]
-      sh "git config --global user.name '#{ENV['GIT_NAME']}'"
-      sh "git config --global user.email '#{ENV['GIT_EMAIL']}'"
-      sh "git config --global push.default simple"
-    end
-
-    # Commit and push to github
-    sh "git add --all ."
-    sh "git commit -m 'Committing changed files.'"
-    sh "git push https://${GH_TOKEN}@github.com/datacite/cirneco.rb master --quiet"
-    puts "Pushed changed files to repo"
-  end
-end
-
 # default task is running rspec tests
 task :default => :spec

data/lib/cirneco/doi.rb

@@ -13,7 +13,7 @@ module Cirneco
     desc "get DOI", "get handle url for DOI"
     method_option :username, :default => ENV['MDS_USERNAME']
     method_option :password, :default => ENV['MDS_PASSWORD']
-    method_option :sandbox, :default => ENV['SANDBOX']
+    method_option :sandbox, :type => :boolean, :force => false
     def get(doi)
       if doi == "all"
         response = get_dois(options)
@@ -31,7 +31,7 @@ module Cirneco
     desc "put DOI", "put handle url for DOI"
     method_option :username, :default => ENV['MDS_USERNAME']
     method_option :password, :default => ENV['MDS_PASSWORD']
-    method_option :sandbox, :default => ENV['SANDBOX']
+    method_option :sandbox, :type => :boolean, :force => false
     method_option :url
     def put(doi)
       response = put_doi(doi, options)
@@ -72,7 +72,7 @@ module Cirneco
     method_option :username, :default => ENV['MDS_USERNAME']
     method_option :password, :default => ENV['MDS_PASSWORD']
     method_option :prefix, :default => ENV['PREFIX']
-    method_option :sandbox, :default => ENV['SANDBOX']
+    method_option :sandbox, :type => :boolean, :force => false
     def mint(filepath)
 
       if File.directory?(filepath)
@@ -92,7 +92,7 @@ module Cirneco
     method_option :bibliography, :default => ENV['SITE_REFERENCESPATH']
     method_option :username, :default => ENV['MDS_USERNAME']
     method_option :password, :default => ENV['MDS_PASSWORD']
-    method_option :sandbox, :default => ENV['SANDBOX']
+    method_option :sandbox, :type => :boolean, :force => false
     def hide(filepath)
 
       if File.directory?(filepath)

data/lib/cirneco/media.rb

@@ -14,7 +14,7 @@ module Cirneco
     desc "get DOI", "get media for DOI"
     method_option :username, :default => ENV['MDS_USERNAME']
     method_option :password, :default => ENV['MDS_PASSWORD']
-    method_option :sandbox, :default => ENV['SANDBOX']
+    method_option :sandbox, :type => :boolean, :force => false
     def get(doi)
       response = get_media(doi, options.merge(raw: true))
 
@@ -31,7 +31,7 @@ module Cirneco
     desc "post DOI", "post media for DOI"
     method_option :username, :default => ENV['MDS_USERNAME']
     method_option :password, :default => ENV['MDS_PASSWORD']
-    method_option :sandbox, :default => ENV['SANDBOX']
+    method_option :sandbox, :type => :boolean, :force => false
     method_option :file, :aliases => '-f'
     def post(doi)
       filename  = options[:file] || doi.split("/", 2).last + ".txt"

data/lib/cirneco/metadata.rb

@@ -14,7 +14,7 @@ module Cirneco
     desc "get DOI", "get metadata for DOI"
     method_option :username, :default => ENV['MDS_USERNAME']
     method_option :password, :default => ENV['MDS_PASSWORD']
-    method_option :sandbox, :default => ENV['SANDBOX']
+    method_option :sandbox, :type => :boolean, :force => false
     def get(doi)
       response = get_metadata(doi, options)
 
@@ -31,7 +31,7 @@ module Cirneco
     desc "post DOI", "post metadata for DOI"
     method_option :username, :default => ENV['MDS_USERNAME']
     method_option :password, :default => ENV['MDS_PASSWORD']
-    method_option :sandbox, :default => ENV['SANDBOX']
+    method_option :sandbox, :type => :boolean, :force => false
     def post(file)
       data = IO.read(file)
       response = post_metadata(data, options)
@@ -46,7 +46,7 @@ module Cirneco
     desc "delete DOI", "hide metadata for DOI"
     method_option :username, :default => ENV['MDS_USERNAME']
     method_option :password, :default => ENV['MDS_PASSWORD']
-    method_option :sandbox, :default => ENV['SANDBOX']
+    method_option :sandbox, :type => :boolean, :force => false
     def delete(doi)
       response = delete_metadata(doi, options)
 

data/lib/cirneco/utils.rb

@@ -63,17 +63,15 @@ module Cirneco
     end
 
     def mint_dois_for_all_files(folderpath, options={})
-      response = Dir.glob("#{folderpath}/*.md").map do |filepath|
+      Dir.glob("#{folderpath}/*.md").map do |filepath|
         mint_doi_for_file(filepath, options)
-      end.select { |r| r != "No new DOI minted." }
-      response.present? ? response.join("\n") : "No new DOI minted"
+      end.uniq.join("\n")
     end
 
     def hide_dois_for_all_files(folderpath, options={})
-      response = Dir.glob("#{folderpath}/*.md").map do |filepath|
+      Dir.glob("#{folderpath}/*.md").map do |filepath|
         hide_doi_for_file(filepath, options)
-      end.select { |r| r != "No new DOI hidden." }
-      response.present? ? response.join("\n") : "No new DOI hidden"
+      end.uniq.join("\n")
     end
 
     def generate_metadata_for_work(filepath, options={})

data/lib/cirneco/version.rb

@@ -1,3 +1,3 @@
 module Cirneco
-  VERSION = "0.7"
+  VERSION = "0.7.1"
 end

data/spec/doi_spec.rb

@@ -14,7 +14,6 @@ describe Cirneco::Doi do
   let(:filepath) { fixture_path + filename }
   let(:username) { ENV['MDS_USERNAME'] }
   let(:password) { ENV['MDS_PASSWORD'] }
-  let(:sandbox) { ENV['SANDBOX'] }
   let(:csl) { "spec/fixtures/apa.csl" }
   let(:bibliography) { "spec/fixtures/bibliography.yaml" }
   let(:api_options) { { username: username, password: password, sandbox: true } }

data/spec/fixtures/vcr_cassettes/Cirneco_DataCenter/get/should_get_all_dois_by_prefix.yml

@@ -21,7 +21,7 @@ http_interactions:
       Server:
       - nginx/1.4.6 (Ubuntu)
       Date:
-      - Mon, 19 Dec 2016 06:31:32 GMT
+      - Mon, 19 Dec 2016 08:14:37 GMT
       Content-Type:
       - text/html;charset=UTF-8
       Connection:
@@ -49,5 +49,5 @@ http_interactions:
         10.5438/EXAMPLE-FULL
         10.5438/MDS-CLIENT-RUBY-TEST
     http_version: 
-  recorded_at: Mon, 19 Dec 2016 06:31:32 GMT
+  recorded_at: Mon, 19 Dec 2016 08:14:37 GMT
 recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/Cirneco_DataCenter/mint_and_hide_DOIs/should_hide_metadata_for_work.yml

@@ -21,7 +21,7 @@ http_interactions:
       Server:
       - nginx/1.4.6 (Ubuntu)
       Date:
-      - Mon, 19 Dec 2016 06:46:24 GMT
+      - Mon, 19 Dec 2016 08:14:47 GMT
       Content-Type:
       - text/html;charset=UTF-8
       Connection:
@@ -36,5 +36,5 @@ http_interactions:
       encoding: UTF-8
       string: OK
     http_version: 
-  recorded_at: Mon, 19 Dec 2016 06:46:24 GMT
+  recorded_at: Mon, 19 Dec 2016 08:14:47 GMT
 recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/Cirneco_DataCenter/mint_and_hide_DOIs/should_post_metadata_for_work.yml

@@ -63,7 +63,7 @@ http_interactions:
       Server:
       - nginx/1.4.6 (Ubuntu)
       Date:
-      - Mon, 19 Dec 2016 06:59:48 GMT
+      - Mon, 19 Dec 2016 08:14:45 GMT
       Content-Type:
       - text/html;charset=UTF-8
       Location:
@@ -80,7 +80,7 @@ http_interactions:
       encoding: UTF-8
       string: OK (10.5072/0000-03VC)
     http_version: 
-  recorded_at: Mon, 19 Dec 2016 06:59:48 GMT
+  recorded_at: Mon, 19 Dec 2016 08:14:45 GMT
 - request:
     method: put
     uri: https://mds.test.datacite.org/doi/10.5072/0000-03VC
@@ -106,7 +106,7 @@ http_interactions:
       Server:
       - nginx/1.4.6 (Ubuntu)
       Date:
-      - Mon, 19 Dec 2016 06:59:49 GMT
+      - Mon, 19 Dec 2016 08:14:46 GMT
       Content-Type:
       - text/html;charset=UTF-8
       Connection:
@@ -121,5 +121,5 @@ http_interactions:
       encoding: UTF-8
       string: OK
     http_version: 
-  recorded_at: Mon, 19 Dec 2016 06:59:49 GMT
+  recorded_at: Mon, 19 Dec 2016 08:14:46 GMT
 recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/Cirneco_Doi/MDS_DOI_API/get/should_get_all_dois.yml

@@ -21,7 +21,7 @@ http_interactions:
       Server:
       - nginx/1.4.6 (Ubuntu)
       Date:
-      - Mon, 19 Dec 2016 06:31:32 GMT
+      - Mon, 19 Dec 2016 08:14:37 GMT
       Content-Type:
       - text/html;charset=UTF-8
       Connection:
@@ -49,5 +49,5 @@ http_interactions:
         10.5438/EXAMPLE-FULL
         10.5438/MDS-CLIENT-RUBY-TEST
     http_version: 
-  recorded_at: Mon, 19 Dec 2016 06:31:32 GMT
+  recorded_at: Mon, 19 Dec 2016 08:14:37 GMT
 recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/Cirneco_Doi/MDS_DOI_API/get/should_get_doi.yml

@@ -21,7 +21,7 @@ http_interactions:
       Server:
       - nginx/1.4.6 (Ubuntu)
       Date:
-      - Mon, 19 Dec 2016 06:31:32 GMT
+      - Mon, 19 Dec 2016 08:14:37 GMT
       Content-Type:
       - text/html;charset=UTF-8
       Connection:
@@ -36,5 +36,5 @@ http_interactions:
       encoding: UTF-8
       string: http://www.datacite.org
     http_version: 
-  recorded_at: Mon, 19 Dec 2016 06:31:32 GMT
+  recorded_at: Mon, 19 Dec 2016 08:14:37 GMT
 recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/Cirneco_Doi/MDS_DOI_API/put/should_put_doi.yml

@@ -25,7 +25,7 @@ http_interactions:
       Server:
       - nginx/1.4.6 (Ubuntu)
       Date:
-      - Mon, 19 Dec 2016 06:31:31 GMT
+      - Mon, 19 Dec 2016 08:14:37 GMT
       Content-Type:
       - text/html;charset=UTF-8
       Connection:
@@ -40,5 +40,5 @@ http_interactions:
       encoding: UTF-8
       string: OK
     http_version: 
-  recorded_at: Mon, 19 Dec 2016 06:31:31 GMT
+  recorded_at: Mon, 19 Dec 2016 08:14:37 GMT
 recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/Cirneco_Work/DOI_API/get/should_get_all_dois.yml

@@ -21,7 +21,7 @@ http_interactions:
       Server:
       - nginx/1.4.6 (Ubuntu)
       Date:
-      - Mon, 19 Dec 2016 06:31:24 GMT
+      - Mon, 19 Dec 2016 08:14:48 GMT
       Content-Type:
       - text/html;charset=UTF-8
       Connection:
@@ -49,5 +49,5 @@ http_interactions:
         10.5438/EXAMPLE-FULL
         10.5438/MDS-CLIENT-RUBY-TEST
     http_version: 
-  recorded_at: Mon, 19 Dec 2016 06:31:25 GMT
+  recorded_at: Mon, 19 Dec 2016 08:14:48 GMT
 recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/Cirneco_Work/DOI_API/get/should_get_doi.yml

@@ -21,7 +21,7 @@ http_interactions:
       Server:
       - nginx/1.4.6 (Ubuntu)
       Date:
-      - Mon, 19 Dec 2016 06:31:24 GMT
+      - Mon, 19 Dec 2016 08:14:48 GMT
       Content-Type:
       - text/html;charset=UTF-8
       Connection:
@@ -36,5 +36,5 @@ http_interactions:
       encoding: UTF-8
       string: http://www.datacite.org
     http_version: 
-  recorded_at: Mon, 19 Dec 2016 06:31:25 GMT
+  recorded_at: Mon, 19 Dec 2016 08:14:48 GMT
 recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/Cirneco_Work/DOI_API/put/should_put_doi.yml

@@ -25,7 +25,7 @@ http_interactions:
       Server:
       - nginx/1.4.6 (Ubuntu)
       Date:
-      - Mon, 19 Dec 2016 06:31:24 GMT
+      - Mon, 19 Dec 2016 08:14:48 GMT
       Content-Type:
       - text/html;charset=UTF-8
       Connection:
@@ -40,5 +40,5 @@ http_interactions:
       encoding: UTF-8
       string: OK
     http_version: 
-  recorded_at: Mon, 19 Dec 2016 06:31:25 GMT
+  recorded_at: Mon, 19 Dec 2016 08:14:48 GMT
 recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/Cirneco_Work/Media_API/get/should_get_media.yml

@@ -21,7 +21,7 @@ http_interactions:
       Server:
       - nginx/1.4.6 (Ubuntu)
       Date:
-      - Mon, 19 Dec 2016 06:31:25 GMT
+      - Mon, 19 Dec 2016 08:14:49 GMT
       Content-Type:
       - application/xml;charset=UTF-8
       Content-Length:
@@ -40,5 +40,5 @@ http_interactions:
 
 '
     http_version: 
-  recorded_at: Mon, 19 Dec 2016 06:31:25 GMT
+  recorded_at: Mon, 19 Dec 2016 08:14:49 GMT
 recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/Cirneco_Work/Media_API/post/should_post_media.yml

@@ -23,7 +23,7 @@ http_interactions:
       Server:
       - nginx/1.4.6 (Ubuntu)
       Date:
-      - Mon, 19 Dec 2016 06:31:24 GMT
+      - Mon, 19 Dec 2016 08:14:49 GMT
       Content-Type:
       - text/html;charset=UTF-8
       Connection:
@@ -38,5 +38,5 @@ http_interactions:
       encoding: UTF-8
       string: OK
     http_version: 
-  recorded_at: Mon, 19 Dec 2016 06:31:25 GMT
+  recorded_at: Mon, 19 Dec 2016 08:14:49 GMT
 recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/Cirneco_Work/Metadata_API/delete/should_delete_metadata.yml

@@ -21,7 +21,7 @@ http_interactions:
       Server:
       - nginx/1.4.6 (Ubuntu)
       Date:
-      - Mon, 19 Dec 2016 06:31:23 GMT
+      - Mon, 19 Dec 2016 08:14:47 GMT
       Content-Type:
       - text/html;charset=UTF-8
       Connection:
@@ -36,5 +36,5 @@ http_interactions:
       encoding: UTF-8
       string: OK
     http_version: 
-  recorded_at: Mon, 19 Dec 2016 06:31:24 GMT
+  recorded_at: Mon, 19 Dec 2016 08:14:47 GMT
 recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/Cirneco_Work/Metadata_API/get/should_get_metadata.yml

@@ -21,7 +21,7 @@ http_interactions:
       Server:
       - nginx/1.4.6 (Ubuntu)
       Date:
-      - Mon, 19 Dec 2016 06:31:23 GMT
+      - Mon, 19 Dec 2016 08:15:40 GMT
       Content-Type:
       - application/xml;charset=UTF-8
       Content-Length:
@@ -56,5 +56,5 @@ http_interactions:
           <resourceType resourceTypeGeneral="Software">XML</resourceType>
         </resource>
     http_version: 
-  recorded_at: Mon, 19 Dec 2016 06:31:24 GMT
+  recorded_at: Mon, 19 Dec 2016 08:15:40 GMT
 recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/Cirneco_Work/Metadata_API/post/should_post_metadata.yml

@@ -41,7 +41,7 @@ http_interactions:
       Server:
       - nginx/1.4.6 (Ubuntu)
       Date:
-      - Mon, 19 Dec 2016 06:31:23 GMT
+      - Mon, 19 Dec 2016 08:14:48 GMT
       Content-Type:
       - text/html;charset=UTF-8
       Location:
@@ -58,5 +58,5 @@ http_interactions:
       encoding: UTF-8
       string: OK (10.5072/0000-03VC)
     http_version: 
-  recorded_at: Mon, 19 Dec 2016 06:31:24 GMT
+  recorded_at: Mon, 19 Dec 2016 08:14:48 GMT
 recorded_with: VCR 3.0.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cirneco
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: 0.7.1
 platform: ruby
 authors:
 - Martin Fenner