Resolved a critical issue where user cannot require azure/storage/blo…

…b, or common and table
Azure · Jan 17, 2018 · 0d3e5ac · 0d3e5ac
1 parent b53d436
commit 0d3e5ac
Show file tree

Hide file tree

Showing 18 changed files with 87 additions and 45 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,5 +14,6 @@ before_install:
 script:
 - bundle exec rake test:unit
 - if [ "$TRAVIS_SECURE_ENV_VARS" == "true" ] ; then rake test:integration ; fi
+- rake sanity_check
 
 sudo: false
diff --git a/Rakefile b/Rakefile
@@ -28,48 +28,33 @@ require "rubygems/package_task"
 require "dotenv/tasks"
 require "yard"
 
-namespace :storage_common do
-  gem_spec = eval(File.read("./common/azure-storage-common.gemspec"))
-  Gem::PackageTask.new(gem_spec) do |pkg|
-    pkg.need_zip = false
-    pkg.need_tar = false
-    pkg.package_dir = "pkg_azure_storage_common"
+task :build_common do
+  Dir.chdir("./common") do
+    system "gem build azure-storage-common.gemspec"
   end
 end
 
-namespace :storage_blob do
-  gem_spec = eval(File.read("./blob/azure-storage-blob.gemspec"))
-  Gem::PackageTask.new(gem_spec) do |pkg|
-    pkg.need_zip = false
-    pkg.need_tar = false
-    pkg.package_dir = "pkg_azure_storage_blob"
+task :build_blob do
+  Dir.chdir("./blob") do
+    system "gem build azure-storage-blob.gemspec"
   end
 end
 
-namespace :storage_file do
-  gem_spec = eval(File.read("./file/azure-storage-file.gemspec"))
-  Gem::PackageTask.new(gem_spec) do |pkg|
-    pkg.need_zip = false
-    pkg.need_tar = false
-    pkg.package_dir = "pkg_azure_storage_file"
+task :build_table do
+  Dir.chdir("./table") do
+    system "gem build azure-storage-table.gemspec"
   end
 end
 
-namespace :storage_table do
-  gem_spec = eval(File.read("./table/azure-storage-table.gemspec"))
-  Gem::PackageTask.new(gem_spec) do |pkg|
-    pkg.need_zip = false
-    pkg.need_tar = false
-    pkg.package_dir = "pkg_azure_storage_table"
+task :build_file do
+  Dir.chdir("./file") do
+    system "gem build azure-storage-file.gemspec"
   end
 end
 
-namespace :storage_queue do
-  gem_spec = eval(File.read("./queue/azure-storage-queue.gemspec"))
-  Gem::PackageTask.new(gem_spec) do |pkg|
-    pkg.need_zip = false
-    pkg.need_tar = false
-    pkg.package_dir = "pkg_azure_storage_queue"
+task :build_queue do
+  Dir.chdir("./queue") do
+    system "gem build azure-storage-queue.gemspec"
   end
 end
 
@@ -204,4 +189,28 @@ end
 
 task test: %w(test:unit test:integration)
 
+task :sanity_check do
+  system "rake build_common"
+  system "rake build_blob"
+  system "rake build_file"
+  system "rake build_table"
+  system "rake build_queue"
+  Dir.chdir("./common") do
+    system "gem install azure-storage-common -l"
+  end
+  Dir.chdir("./blob") do
+    system "gem install azure-storage-blob -l"
+  end
+  Dir.chdir("./table") do
+    system "gem install azure-storage-table -l"
+  end
+  Dir.chdir("./queue") do
+    system "gem install azure-storage-queue -l"
+  end
+  Dir.chdir("./file") do
+    system "gem install azure-storage-file -l"
+  end
+  system "ruby ./test/sanity_check.rb"
+end
+
 task default: :test
diff --git a/blob/ChangeLog.md b/blob/ChangeLog.md
@@ -1,3 +1,6 @@
+2018.1 - version 1.0.1
+* Resolved an issue where user cannot use Gem package using `gem install`.
+
 2018.1 - version 1.0.0
 
 * This module now only consists of functionalities to access Azure Storage Blob Service.

diff --git a/blob/azure-storage-blob.gemspec b/blob/azure-storage-blob.gemspec
@@ -25,7 +25,7 @@
 #--------------------------------------------------------------------------
 require "date"
 
-require File.expand_path("../blob/lib/azure/storage/blob/version", __FILE__)
+require_relative "./lib/azure/storage/blob/version"
 
 Gem::Specification.new do |s|
   s.name        = "azure-storage-blob"
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.summary     = "Official Ruby client library to consume Azure Storage Blob service"
   s.homepage    = "http://github.com/azure/azure-storage-ruby"
   s.license     = "MIT"
-  s.files       = `git ls-files ./blob/lib/azure/storage/blob/`.split("\n") << "blob/lib/azure/storage/blob.rb"
+  s.files       = `git ls-files ./lib/azure/storage/blob/`.split("\n") << "./lib/azure/storage/blob.rb"
 
   s.required_ruby_version = ">= 1.9.3"
 

diff --git a/blob/lib/azure/storage/blob/version.rb b/blob/lib/azure/storage/blob/version.rb
@@ -31,7 +31,7 @@ class Version
         # Fields represent the parts defined in http://semver.org/
         MAJOR = 1 unless defined? MAJOR
         MINOR = 0 unless defined? MINOR
-        UPDATE = 0 unless defined? UPDATE
+        UPDATE = 1 unless defined? UPDATE
 
         class << self
           # @return [String]

diff --git a/common/ChangeLog.md b/common/ChangeLog.md
@@ -1,3 +1,6 @@
+2018.1 - version 1.0.1
+* Resolved an issue where user cannot use Gem package using `gem install`.
+
 2018.1 - version 1.0.0
 
 * This module now consists of functionalities to support service client library modules.

diff --git a/common/azure-storage-common.gemspec b/common/azure-storage-common.gemspec
@@ -25,7 +25,7 @@
 #--------------------------------------------------------------------------
 require "date"
 
-require File.expand_path("../common/lib/azure/storage/common/version", __FILE__)
+require_relative "./lib/azure/storage/common/version"
 
 Gem::Specification.new do |s|
   s.name        = "azure-storage-common"
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.summary     = "Official Ruby client library to consume Azure Storage Common service"
   s.homepage    = "http://github.com/azure/azure-storage-ruby"
   s.license     = "MIT"
-  s.files       = `git ls-files ./common/lib/azure/storage/common/`.split("\n") << "common/lib/azure/storage/common.rb"
+  s.files       = `git ls-files ./lib/azure/storage/common/`.split("\n") << "./lib/azure/storage/common.rb"
 
   s.required_ruby_version = ">= 1.9.3"
 

diff --git a/common/lib/azure/storage/common/version.rb b/common/lib/azure/storage/common/version.rb
@@ -31,7 +31,7 @@ class Version
         # Fields represent the parts defined in http://semver.org/
         MAJOR = 1 unless defined? MAJOR
         MINOR = 0 unless defined? MINOR
-        UPDATE = 0 unless defined? UPDATE
+        UPDATE = 1 unless defined? UPDATE
 
         class << self
           # @return [String]

diff --git a/file/ChangeLog.md b/file/ChangeLog.md
@@ -1,3 +1,6 @@
+2018.1 - version 1.0.1
+* Resolved an issue where user cannot use Gem package using `gem install`.
+
 2018.1 - version 1.0.0
 
 * This module now only consists of functionalities to access Azure Storage File Service.

diff --git a/file/azure-storage-file.gemspec b/file/azure-storage-file.gemspec
@@ -25,7 +25,7 @@
 #--------------------------------------------------------------------------
 require "date"
 
-require File.expand_path("../file/lib/azure/storage/file/version", __FILE__)
+require_relative "./lib/azure/storage/file/version"
 
 Gem::Specification.new do |s|
   s.name        = "azure-storage-file"
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.summary     = "Official Ruby client library to consume Azure Storage File service"
   s.homepage    = "http://github.com/azure/azure-storage-ruby"
   s.license     = "MIT"
-  s.files       = `git ls-files ./file/lib/azure/storage/file`.split("\n") << "file/lib/azure/storage/file.rb"
+  s.files       = `git ls-files ./lib/azure/storage/file`.split("\n") << "./lib/azure/storage/file.rb"
 
   s.required_ruby_version = ">= 1.9.3"
 

diff --git a/file/lib/azure/storage/file/version.rb b/file/lib/azure/storage/file/version.rb
@@ -31,7 +31,7 @@ class Version
         # Fields represent the parts defined in http://semver.org/
         MAJOR = 1 unless defined? MAJOR
         MINOR = 0 unless defined? MINOR
-        UPDATE = 0 unless defined? UPDATE
+        UPDATE = 1 unless defined? UPDATE
 
         class << self
           # @return [String]

diff --git a/queue/ChangeLog.md b/queue/ChangeLog.md
@@ -1,3 +1,6 @@
+2018.1 - version 1.0.1
+* Resolved an issue where user cannot use Gem package using `gem install`.
+
 2018.1 - version 1.0.0
 
 * This module now only consists of functionalities to access Azure Storage Queue Service.

diff --git a/queue/azure-storage-queue.gemspec b/queue/azure-storage-queue.gemspec
@@ -25,7 +25,7 @@
 #--------------------------------------------------------------------------
 require "date"
 
-require File.expand_path("../queue/lib/azure/storage/queue/version", __FILE__)
+require_relative "./lib/azure/storage/queue/version"
 
 Gem::Specification.new do |s|
   s.name        = "azure-storage-queue"
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.summary     = "Official Ruby client library to consume Azure Storage Queue service"
   s.homepage    = "http://github.com/azure/azure-storage-ruby"
   s.license     = "MIT"
-  s.files       = `git ls-files ./queue/lib/azure/storage/queue/`.split("\n") << "queue/lib/azure/storage/queue.rb"
+  s.files       = `git ls-files ./lib/azure/storage/queue/`.split("\n") << "./lib/azure/storage/queue.rb"
 
   s.required_ruby_version = ">= 1.9.3"
 

diff --git a/queue/lib/azure/storage/queue/version.rb b/queue/lib/azure/storage/queue/version.rb
@@ -31,7 +31,7 @@ class Version
         # Fields represent the parts defined in http://semver.org/
         MAJOR = 1 unless defined? MAJOR
         MINOR = 0 unless defined? MINOR
-        UPDATE = 0 unless defined? UPDATE
+        UPDATE = 1 unless defined? UPDATE
 
         class << self
           # @return [String]

diff --git a/table/ChangeLog.md b/table/ChangeLog.md
@@ -1,3 +1,6 @@
+2018.1 - version 1.0.1
+* Resolved an issue where user cannot use Gem package using `gem install`.
+
 2018.1 - version 1.0.0
 
 * This module now only consists of functionalities to access Azure Storage Table Service.

diff --git a/table/azure-storage-table.gemspec b/table/azure-storage-table.gemspec
@@ -25,7 +25,7 @@
 #--------------------------------------------------------------------------
 require "date"
 
-require File.expand_path("../table/lib/azure/storage/table/version", __FILE__)
+require_relative "./lib/azure/storage/table/version"
 
 Gem::Specification.new do |s|
   s.name        = "azure-storage-table"
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.summary     = "Official Ruby client library to consume Azure Storage Table service"
   s.homepage    = "http://github.com/azure/azure-storage-ruby"
   s.license     = "MIT"
-  s.files       = `git ls-files ./table/lib/azure/storage/table/`.split("\n") << "table/lib/azure/storage/table.rb"
+  s.files       = `git ls-files ./lib/azure/storage/table/`.split("\n") << "./lib/azure/storage/table.rb"
 
   s.required_ruby_version = ">= 1.9.3"
 

diff --git a/table/lib/azure/storage/table/version.rb b/table/lib/azure/storage/table/version.rb
@@ -31,7 +31,7 @@ class Version
         # Fields represent the parts defined in http://semver.org/
         MAJOR = 1 unless defined? MAJOR
         MINOR = 0 unless defined? MINOR
-        UPDATE = 0 unless defined? UPDATE
+        UPDATE = 1 unless defined? UPDATE
 
         class << self
           # @return [String]

diff --git a/test/sanity_check.rb b/test/sanity_check.rb
@@ -0,0 +1,17 @@
+  require "azure/storage/common"
+  require "azure/storage/blob"
+  require "azure/storage/table"
+  require "azure/storage/queue"
+  require "azure/storage/file"
+
+  raise StandardError.new "Failed to load Common module" if Azure::Storage::Common::Version.nil?
+  raise StandardError.new "Failed to load Blob module" if Azure::Storage::Blob::Version.nil?
+  raise StandardError.new "Failed to load Queue module" if Azure::Storage::Queue::Version.nil?
+  raise StandardError.new "Failed to load Table module" if Azure::Storage::Table::Version.nil?
+  raise StandardError.new "Failed to load File module" if Azure::Storage::File::Version.nil?
+
+  puts "Installed gem version of common is #{Azure::Storage::Common::Version}"
+  puts "Installed gem version of blob is #{Azure::Storage::Blob::Version}"
+  puts "Installed gem version of queue is #{Azure::Storage::Queue::Version}"
+  puts "Installed gem version of table is #{Azure::Storage::Table::Version}"
+  puts "Installed gem version of file is #{Azure::Storage::File::Version}"