relishable 0.34 → 0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a70e4d1a3c96659d9c564e9d3fa70dba6c313c0f
-  data.tar.gz: c855d50881f69eeca76aa6339fcb350ab3c44dcf
+  metadata.gz: 8bf410339f64a0e2526441a2717017414062e45d
+  data.tar.gz: f7f11bf1ac673c8a73de78967a1152c86c358ab1
 SHA512:
-  metadata.gz: 280a16f779a35851f5dac62e0eecadb0e3daf66e8d4476d95f75a610f791a69f2707aab6262b12136da0d1e9e01070d30889b24351352a90aed520735b5d27b1
-  data.tar.gz: 57eb798a8ea51d7dbd7ca959ec8c597fb47821fef17023ac325daa52d519b8c9b6ce578f096bb42f2a357b73a1dfa3bef18ea2374f0da48f0baa7741f6942a14
+  metadata.gz: 9a3dd84d20f1bed8e335ddf3999569dc005e7a8a05ba015d6b28f51326ee5431a7aa53589c753889e867f457a8feac0e620181bf508f7d97dff406916571f310
+  data.tar.gz: c0e8e81b5bf9b9555c75640db400b5888e768cbbabaa4af24cae118b69cd1a9d180428a6f33a1266cdfec418235433389634e297a4743c8d13eeb5c40510fc19

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    relishable (0.34)
+    relishable (0.35)
       fog (~> 1.23.0)
       legacy-fernet (~> 1.6.3)
 
@@ -25,17 +25,15 @@ GEM
       fog-core (~> 1.22)
       fog-json
       inflecto (~> 0.0.2)
-    fog-core (1.32.1)
+    fog-core (1.33.0)
       builder
       excon (~> 0.45)
       formatador (~> 0.2)
       mime-types
-      net-scp (~> 1.1)
-      net-ssh (>= 2.1.3)
     fog-json (1.0.2)
       fog-core (~> 1.0)
       multi_json (~> 1.10)
-    fog-softlayer (1.0.0)
+    fog-softlayer (1.0.2)
       fog-core
       fog-json
     formatador (0.2.5)
@@ -46,11 +44,9 @@ GEM
     mime-types (2.6.2)
     mini_portile (0.6.2)
     multi_json (1.11.2)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (3.0.1)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
+    power_assert (0.2.2)
     rake (10.4.2)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
@@ -65,6 +61,8 @@ GEM
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
     safe_yaml (1.0.4)
+    test-unit (3.0.8)
+      power_assert
     webmock (1.19.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -76,6 +74,7 @@ DEPENDENCIES
   rake (> 0)
   relishable!
   rspec (~> 3.1.0)
+  test-unit
   webmock (~> 1.19.0)
 
 BUNDLED WITH

data/lib/relish.rb

@@ -1,5 +1,4 @@
 require "relish/dynamo_helper"
-require "relish/cloudfront_helper"
 require "relish/s3_helper"
 require "relish/encryption_helper"
 require "relish/release"

data/lib/relish/release.rb

@@ -18,6 +18,7 @@ class Relish
            :route_id             => :S,
            :slug_uuid            => :S,
            :slug_id              => :S,
+           :slug_checksum        => :S,
            :slug_version         => :N,
            :stack                => :S,
            :language_pack        => :S,

data/lib/relish/version.rb

@@ -1,5 +1,5 @@
 class Relish
-  VERSION = "0.34"
+  VERSION = "0.35"
 end
 
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relishable
 version: !ruby/object:Gem::Version
-  version: '0.34'
+  version: '0.35'
 platform: ruby
 authors:
 - Mark Fine
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -69,6 +69,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +110,6 @@ files:
 - Gemfile
 - Gemfile.lock
 - lib/relish.rb
-- lib/relish/cloudfront_helper.rb
 - lib/relish/dynamo_helper.rb
 - lib/relish/encryption_helper.rb
 - lib/relish/release.rb
@@ -126,4 +139,3 @@ signing_key:
 specification_version: 4
 summary: releases
 test_files: []
-has_rdoc: 

data/lib/relish/cloudfront_helper.rb

@@ -1,65 +0,0 @@
-# Adapted from https://github.com/stlondemand/aws_cf_signer
-# Modified to support in-memory instead of on-disk signing keys
-require 'openssl'
-require 'time'
-require 'base64'
-
-class Relish
-  class CloudFrontHelper
-
-    attr_reader :key_pair_id
-
-    def initialize(pem, key_pair_id)
-      @key         = OpenSSL::PKey::RSA.new(pem)
-      @key_pair_id = key_pair_id
-    end
-
-    def sign(url_to_sign, policy_options = {})
-      separator = url_to_sign =~ /\?/ ? '&' : '?'
-      if policy_options[:policy_file]
-        policy = IO.read(policy_options[:policy_file])
-        "#{url_to_sign}#{separator}Policy=#{encode_policy(policy)}&Signature=#{create_signature(policy)}&Key-Pair-Id=#{@key_pair_id}"
-      else
-        raise ArgumentError.new("'ending' argument is required") if policy_options[:ending].nil?
-        if policy_options.keys.size == 1
-          # Canned Policy - shorter URL
-          expires_at = epoch_time(policy_options[:ending])
-          policy = %({"Statement":[{"Resource":"#{url_to_sign}","Condition":{"DateLessThan":{"AWS:EpochTime":#{expires_at}}}}]})
-          "#{url_to_sign}#{separator}Expires=#{expires_at}&Signature=#{create_signature(policy)}&Key-Pair-Id=#{@key_pair_id}"
-        else
-          # Custom Policy
-          resource = policy_options[:resource] || url_to_sign
-          policy = generate_custom_policy(resource, policy_options)
-          "#{url_to_sign}#{separator}Policy=#{encode_policy(policy)}&Signature=#{create_signature(policy)}&Key-Pair-Id=#{@key_pair_id}"
-        end
-      end
-    end
-
-    def generate_custom_policy(resource, options)
-      conditions = ["\"DateLessThan\":{\"AWS:EpochTime\":#{epoch_time(options[:ending])}}"]
-      conditions << "\"DateGreaterThan\":{\"AWS:EpochTime\":#{epoch_time(options[:starting])}}" if options[:starting]
-      conditions << "\"IpAddress\":{\"AWS:SourceIp\":\"#{options[:ip_range]}\"" if options[:ip_range]
-      %({"Statement":[{"Resource":"#{resource}","Condition":{#{conditions.join(',')}}}}]})
-    end
-
-    def epoch_time(timelike)
-      case timelike
-      when String then Time.parse(timelike).to_i
-      when Time   then timelike.to_i
-      else raise ArgumentError.new("Invalid argument - String or Time required - #{timelike.class} passed.")
-      end
-    end
-
-    def encode_policy(policy)
-      url_safe(Base64.encode64(policy))
-    end
-
-    def create_signature(policy)
-      url_safe(Base64.encode64(@key.sign(OpenSSL::Digest::SHA1.new, (policy))))
-    end
-
-    def url_safe(s)
-      s.gsub('+','-').gsub('=','_').gsub('/','~').gsub(/\n/,'').gsub(' ','')
-    end
-  end
-end