aws_assume_role 1.0.6 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66b6fbba784521cbce5a73e1b7c7483eed5936ffe5604d6e49bc847c1b720b09
-  data.tar.gz: 622cbd5da5bc1e95f0903d5d6d7aa8d81f65af395bab935b7157612258060e31
+  metadata.gz: 5a75991b1e4c430bf00dedb8d69c35ea109cf0a1e073c1b64036299ec0d7f31f
+  data.tar.gz: 268a92df933a848bc8a278eeb3b43026265fae73d87b4ecaf4e6ecd12e91802b
 SHA512:
-  metadata.gz: 6e3b6175c9a26a52f0def3b4f0b988941427da3c6462bc9c2a07f39ff028be3a83763ead53e79064d63877e471096eeddbc4205b5f672828cdccabe112579b70
-  data.tar.gz: 9c799754c7634cd8c36b78d4203c18609f5d0b02e49d7386e27f54913144739f9f1417e4d73ff90ba6a66989568712a712415588fd3b77a47b15666b4ae6b861
+  metadata.gz: e5b7ce3973c19c81f30577eddfbbc1065eea4d793d93bffbbc5dc88862961d4be1d47eda783699daefcaf648407c8b468d8b51989bcc908057c68180375792e2
+  data.tar.gz: 2b3311eb773c464bea0ad25dd19e6eaa2483c3ceac8a16ef1fd9257e4a53bce97fde3602d0f7b510f33d1f71a8ab5e247d24252d4048e071ba1b910b009f2e79

data/.travis.yml

@@ -1,17 +1,20 @@
 language: ruby
-rvm:
-- 2.2
-- 2.3.0
 sudo: false
 script: bundle exec rake
-deploy:
-  provider: rubygems
-  api_key:
-    secure: H6MYP5cWFC0BtqrxW6ahc1RFxywtyKRFjGlSpyoBM+AH2y8U194toWQdGyO/QMRQVr7vAZf+MdxYTutDvnBEkwQbof6QBJ1+4GFWSqFgYAVEV5Ddva0ea5dVE8xC3rMRvd+i5KTzwuVNX/+Cux49v2wGRWZLKOmBSWbujsL8SbpdKaPi+qsClkdz3YTrHpGEEWTPNBNTwDMlg+qAX3UkqoAxD5ebrUaFPdJR83yMSGUPfTm/urlKvkx85MONuj7lPL1CyoYJCvy31bE6CWGq2L/+2Fnk8RvNMCaDffY+8YjKhWduBLrGuUYWf+ZcERxW6AxDy6BFIkekpFwpeaDmrdfSTK0aELSZogGqs9VHs9O1pTApdS/NRYDzxC9hmlvub80xC2uI1Vnhn04Z95Gh9KYh0H20UnlBJJ7ewvFPHzQ3zK8Z2O3kJOeZo0rX2d3yGOydyHlf1dX/auGnn8QVcr7w1jERQDLi5ZEAR+EGnYROvfGKjfP9rgaLoouTbEGXx7KV9QQjLUsmQ0q2yu+HoVlQaDtv7VEQTtFnvdmiVGYbWj+DhaquvTmHyiizO7hFOfvVYYFyOM2iFoRCY+dT3kapqc0DM94BUjxV3tMZX6MYNYfwnNwhNNpTXLVvVXP9cShL+ogwY/E0C2Fg2CYdY5/Ioe6hUbAiPx79dwzVfic=
-  gem: aws_assume_role
-  on:
-    tags: true
-    repo: scalefactory/aws-assume-role
+jobs:
+  include:
+    - stage: test
+      rvm: 2.2
+      script: bundle exec rake
+    - rvm: 2.3
+      script: bundle exec rake
+    - stage: deploy
+      rvm: 2.3
+      script: bundle exec rake setup_credentials && chmod 0600 /home/travis/.gem/credentials && bundle exec rake publish
+stages:
+  - name: test
+  - name: deploy
+    if: tag =~ ^v
 notifications:
   slack:
     secure: RmJmJSSDI8qdIpM2KKYoXX2mpcL85YZ9r9gF4rauZH9TuqnYOPP3kQ5iYJsE0VUTuZpuvQ8Axoux5IQr+IDK7kMrmrI0iaZp1dAR9tGK+aLF73sprOmQEou6HIoDs97UQhOWlsAUR8max/7WYdJYJ1o78dqavfFtOy0VcHCkUMRf+WxcKzz+8MunsocIYi0HXuz5vC3RAZCOaK2h8epXzmnWq0ke8YeTmddpDWC85wzeDNjA9T1j5WD+y6gC9F0vyaqVqDCsCXlbRKZl7a1TU9QGDVyBzowoGsWmTpFR80v4CKofAn6nnMRqblwATOS1jMT+HC+Yku29qFzXPugYa2KAUSQaYQiOe+TE5IDa2Exe/57ZQCOq4ve8gKSE9aQXh4Riq3u8qccM+UeoQdcwgXQIciTeWjqi4LQro6Dbyrv8XrUbxdG0VPsWmf49jbWgq6PPAJqdcbXr9eGb+81uJ2REa1vhDYZu4T3JHv4erd5QlyYWzeBJ/LMQav/C5mnMF43jg8DzZ2g0BZBao/reO9xcZre/ka8eOus9Ll1i+8PCxmFZMx2KDPC9i5R7bXL/CwPBjzFInmvHM0cgKjxrRSY6xMWSPyBbgdsKJl2qag74K5xG+2VPlMcVx0ikTKVjsja5iPlOYKhflGAfCKvpzPcd2QoEWg8jZYqZtO9Nj+M=

data/CHANGELOG.md

@@ -1,5 +1,12 @@
+## 1.1.1
+* Allow aws-assume-role to retrieve all Yubikey stored OATH tokens (@alanthing)
+
+## 1.1.0
+* Publish separate gems for Linux, BSD and MacOS (@randomvariable)
+
 ## 1.0.6
 * Determine gem dependencies for OS X & Linux at install time (@randomvariable)
+
 ## 1.0.5
 * Escape run commands properly (@mrprimate)
 

data/Rakefile

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
+require "aws_assume_role/version"
 require "bundler/gem_tasks"
+require "yaml"
+
 task default: :test
 
 begin
@@ -15,7 +18,48 @@ begin
 rescue LoadError # rubocop:disable Lint/HandleExceptions
 end
 
-task :test => %i[no_pry rubocop spec] # rubocop:disable Style/HashSyntax
+task test: %i[no_pry rubocop spec]
+
+DISTRIBUTIONS = [
+    "universal-linux",
+    "universal-freebsd",
+    "universal-darwin",
+    "universal-openbsd",
+].freeze
+
+CREDENTIALS = {
+    rubygems_api_key: ENV.fetch("API_KEY", "null"),
+}.freeze
+
+task :setup_credentials do
+    FileUtils.mkdir_p(File.expand_path("~/.gem"))
+    File.write(File.expand_path("~/.gem/credentials"), CREDENTIALS.to_yaml)
+end
+
+task publish: %i[build build_generic] do
+    Dir.glob("#{File.dirname(__FILE__)}/pkg/*.gem") do |g|
+        sh "gem push #{g}"
+    end
+end
+
+namespace :build_arch do
+    DISTRIBUTIONS.each do |arch|
+        desc "build binary gem for #{arch}"
+        task arch do
+            sh "cd #{File.dirname(__FILE__)} && PLATFORM=#{arch} gem build aws_assume_role.gemspec"
+            FileUtils.mkdir_p(File.join(File.dirname(__FILE__), "pkg"))
+            sh "cd #{File.dirname(__FILE__)} && mv *.gem pkg/"
+        end
+    end
+end
+
+task build: DISTRIBUTIONS.map { |d| "build_arch:#{d}" }
+
+task :build_generic do
+    sh "cd #{File.dirname(__FILE__)} && GENERIC_GEM=true gem build aws_assume_role.gemspec"
+    FileUtils.mkdir_p(File.join(File.dirname(__FILE__), "pkg"))
+    sh "cd #{File.dirname(__FILE__)} && mv *.gem pkg/"
+end
 
 task :no_pry do
     files = Dir.glob("**/**").reject { |x| x.match(/^spec|Gemfile|coverage|\.gemspec$|Rakefile/) || File.directory?(x) }

data/aws_assume_role.gemspec

@@ -2,6 +2,9 @@
 
 $LOAD_PATH << File.expand_path("../lib", __FILE__)
 require "aws_assume_role/version"
+
+PLATFORM = ENV.fetch("PLATFORM", Gem::Platform.local.os)
+
 Gem::Specification.new do |spec|
     spec.name          = "aws_assume_role"
     spec.version       = AwsAssumeRole::VERSION
@@ -21,9 +24,8 @@ Gem::Specification.new do |spec|
     }
     spec.bindir        = "bin"
     spec.executables   = spec.files.grep(%r{^bin/aws}) { |f| File.basename(f) }
-    spec.extensions    = "ext/mkrf_conf.rb"
     spec.require_paths = ["lib"]
-
+    spec.platform = PLATFORM unless ENV.fetch("GENERIC_GEM", false)
     spec.add_runtime_dependency "activesupport", "~> 4.2"
     spec.add_runtime_dependency "aws-sdk", "~> 2.7"
     spec.add_runtime_dependency "dry-configurable", "~> 0.5"
@@ -44,4 +46,11 @@ Gem::Specification.new do |spec|
     spec.add_development_dependency "yard", "~> 0.9"
     spec.add_development_dependency "simplecov", "~> 0.13"
     spec.add_development_dependency "webmock", "~> 2.3"
+
+    case PLATFORM
+    when /linux|bsd/
+        spec.add_dependency "gir_ffi-gnome_keyring", "~> 0.0", ">= 0.0.3"
+    when /darwin/
+        spec.add_dependency "ruby-keychain", "~> 0.3", ">= 0.3.2"
+    end
 end

data/lib/aws_assume_role/credentials/providers/mfa_session_credentials.rb

@@ -67,8 +67,7 @@ class AwsAssumeRole::Credentials::Providers::MfaSessionCredentials < Dry::Struct
         raise "Yubikey not found" unless context.readers.length == 1
         reader_name = context.readers.first
         card = Smartcard::PCSC::Card.new(context, reader_name, :shared)
-        codes = YubiOATH.new(card).calculate_all(timestamp: Time.now)
-        codes.fetch(BinData::String.new(@yubikey_oath_name))
+        YubiOATH.new(card).calculate(name: @yubikey_oath_name, timestamp: Time.now)
     end
 
     def refresh_using_mfa

data/lib/aws_assume_role/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AwsAssumeRole
-    VERSION = "1.0.6".freeze
+    VERSION = "1.1.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws_assume_role
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.1
 platform: ruby
 authors:
 - Jon Topper
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-02 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -308,6 +308,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: gir_ffi-gnome_keyring
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 description: Used to fetch multiple AWS Role Credential Keys using different Session
   Keys and store them securely using Gnome Keyring or OSX keychain
 email:
@@ -317,8 +337,7 @@ email:
 - tim@scalefactory.com
 executables:
 - aws-assume-role
-extensions:
-- ext/mkrf_conf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
@@ -333,7 +352,6 @@ files:
 - Rakefile
 - aws_assume_role.gemspec
 - bin/aws-assume-role
-- ext/mkrf_conf.rb
 - i18n/en.yml
 - lib/aws_assume_role.rb
 - lib/aws_assume_role/cli.rb

data/ext/mkrf_conf.rb

@@ -1,25 +0,0 @@
-require "rubygems"
-require "rubygems/command"
-require "rubygems/dependency_installer"
-begin
-    Gem::Command.build_args = ARGV
-rescue NoMethodError # rubocop:disable Lint/HandleExceptions
-end
-
-installer = Gem::DependencyInstaller.new
-
-begin
-    case Gem::Platform.local.os
-    when "linux"
-        installer.install "gir_ffi-gnome_keyring", Gem::Requirement.new("~> 0.0", ">= 0.0.3")
-    when "darwin"
-        installer.install "ruby-keychain", Gem::Requirement.new("~> 0.3", ">= 0.3.2")
-    end
-rescue => e # rubocop:disable Lint/RescueWithoutErrorClass
-    puts e.backtrace
-    exit(1)
-end
-
-f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w") # create dummy rakefile to indicate success
-f.write("task :default\n")
-f.close