Skip to content

Commit 0d3e5ac

Browse files
katmsftvinjiang
katmsft
authored and
vinjiang
committed
Resolved a critical issue where user cannot require azure/storage/blob, or common and table
1 parent b53d436 commit 0d3e5ac

File tree

18 files changed

+87
-45
lines changed

18 files changed

+87
-45
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@ before_install:
1414
script:
1515
- bundle exec rake test:unit
1616
- if [ "$TRAVIS_SECURE_ENV_VARS" == "true" ] ; then rake test:integration ; fi
17+
- rake sanity_check
1718

1819
sudo: false

‎Rakefile‎

Lines changed: 39 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -28,48 +28,33 @@ require "rubygems/package_task"
2828
require "dotenv/tasks"
2929
require "yard"
3030

31-
namespace :storage_common do
32-
gem_spec = eval(File.read("./common/azure-storage-common.gemspec"))
33-
Gem::PackageTask.new(gem_spec) do |pkg|
34-
pkg.need_zip = false
35-
pkg.need_tar = false
36-
pkg.package_dir = "pkg_azure_storage_common"
31+
task :build_common do
32+
Dir.chdir("./common") do
33+
system "gem build azure-storage-common.gemspec"
3734
end
3835
end
3936

40-
namespace :storage_blob do
41-
gem_spec = eval(File.read("./blob/azure-storage-blob.gemspec"))
42-
Gem::PackageTask.new(gem_spec) do |pkg|
43-
pkg.need_zip = false
44-
pkg.need_tar = false
45-
pkg.package_dir = "pkg_azure_storage_blob"
37+
task :build_blob do
38+
Dir.chdir("./blob") do
39+
system "gem build azure-storage-blob.gemspec"
4640
end
4741
end
4842

49-
namespace :storage_file do
50-
gem_spec = eval(File.read("./file/azure-storage-file.gemspec"))
51-
Gem::PackageTask.new(gem_spec) do |pkg|
52-
pkg.need_zip = false
53-
pkg.need_tar = false
54-
pkg.package_dir = "pkg_azure_storage_file"
43+
task :build_table do
44+
Dir.chdir("./table") do
45+
system "gem build azure-storage-table.gemspec"
5546
end
5647
end
5748

58-
namespace :storage_table do
59-
gem_spec = eval(File.read("./table/azure-storage-table.gemspec"))
60-
Gem::PackageTask.new(gem_spec) do |pkg|
61-
pkg.need_zip = false
62-
pkg.need_tar = false
63-
pkg.package_dir = "pkg_azure_storage_table"
49+
task :build_file do
50+
Dir.chdir("./file") do
51+
system "gem build azure-storage-file.gemspec"
6452
end
6553
end
6654

67-
namespace :storage_queue do
68-
gem_spec = eval(File.read("./queue/azure-storage-queue.gemspec"))
69-
Gem::PackageTask.new(gem_spec) do |pkg|
70-
pkg.need_zip = false
71-
pkg.need_tar = false
72-
pkg.package_dir = "pkg_azure_storage_queue"
55+
task :build_queue do
56+
Dir.chdir("./queue") do
57+
system "gem build azure-storage-queue.gemspec"
7358
end
7459
end
7560

@@ -204,4 +189,28 @@ end
204189

205190
task test: %w(test:unit test:integration)
206191

192+
task :sanity_check do
193+
system "rake build_common"
194+
system "rake build_blob"
195+
system "rake build_file"
196+
system "rake build_table"
197+
system "rake build_queue"
198+
Dir.chdir("./common") do
199+
system "gem install azure-storage-common -l"
200+
end
201+
Dir.chdir("./blob") do
202+
system "gem install azure-storage-blob -l"
203+
end
204+
Dir.chdir("./table") do
205+
system "gem install azure-storage-table -l"
206+
end
207+
Dir.chdir("./queue") do
208+
system "gem install azure-storage-queue -l"
209+
end
210+
Dir.chdir("./file") do
211+
system "gem install azure-storage-file -l"
212+
end
213+
system "ruby ./test/sanity_check.rb"
214+
end
215+
207216
task default: :test

‎blob/ChangeLog.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2018.1 - version 1.0.1
2+
* Resolved an issue where user cannot use Gem package using `gem install`.
3+
14
2018.1 - version 1.0.0
25

36
* This module now only consists of functionalities to access Azure Storage Blob Service.

‎blob/azure-storage-blob.gemspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#--------------------------------------------------------------------------
2626
require "date"
2727

28-
require File.expand_path("../blob/lib/azure/storage/blob/version", __FILE__)
28+
require_relative "./lib/azure/storage/blob/version"
2929

3030
Gem::Specification.new do |s|
3131
s.name = "azure-storage-blob"
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
3636
s.summary = "Official Ruby client library to consume Azure Storage Blob service"
3737
s.homepage = "http://github.com/azure/azure-storage-ruby"
3838
s.license = "MIT"
39-
s.files = `git ls-files ./blob/lib/azure/storage/blob/`.split("\n") << "blob/lib/azure/storage/blob.rb"
39+
s.files = `git ls-files ./lib/azure/storage/blob/`.split("\n") << "./lib/azure/storage/blob.rb"
4040

4141
s.required_ruby_version = ">= 1.9.3"
4242

‎blob/lib/azure/storage/blob/version.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class Version
3131
# Fields represent the parts defined in http://semver.org/
3232
MAJOR = 1 unless defined? MAJOR
3333
MINOR = 0 unless defined? MINOR
34-
UPDATE = 0 unless defined? UPDATE
34+
UPDATE = 1 unless defined? UPDATE
3535

3636
class << self
3737
# @return [String]

‎common/ChangeLog.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2018.1 - version 1.0.1
2+
* Resolved an issue where user cannot use Gem package using `gem install`.
3+
14
2018.1 - version 1.0.0
25

36
* This module now consists of functionalities to support service client library modules.

‎common/azure-storage-common.gemspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#--------------------------------------------------------------------------
2626
require "date"
2727

28-
require File.expand_path("../common/lib/azure/storage/common/version", __FILE__)
28+
require_relative "./lib/azure/storage/common/version"
2929

3030
Gem::Specification.new do |s|
3131
s.name = "azure-storage-common"
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
3636
s.summary = "Official Ruby client library to consume Azure Storage Common service"
3737
s.homepage = "http://github.com/azure/azure-storage-ruby"
3838
s.license = "MIT"
39-
s.files = `git ls-files ./common/lib/azure/storage/common/`.split("\n") << "common/lib/azure/storage/common.rb"
39+
s.files = `git ls-files ./lib/azure/storage/common/`.split("\n") << "./lib/azure/storage/common.rb"
4040

4141
s.required_ruby_version = ">= 1.9.3"
4242

‎common/lib/azure/storage/common/version.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class Version
3131
# Fields represent the parts defined in http://semver.org/
3232
MAJOR = 1 unless defined? MAJOR
3333
MINOR = 0 unless defined? MINOR
34-
UPDATE = 0 unless defined? UPDATE
34+
UPDATE = 1 unless defined? UPDATE
3535

3636
class << self
3737
# @return [String]

‎file/ChangeLog.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2018.1 - version 1.0.1
2+
* Resolved an issue where user cannot use Gem package using `gem install`.
3+
14
2018.1 - version 1.0.0
25

36
* This module now only consists of functionalities to access Azure Storage File Service.

‎file/azure-storage-file.gemspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#--------------------------------------------------------------------------
2626
require "date"
2727

28-
require File.expand_path("../file/lib/azure/storage/file/version", __FILE__)
28+
require_relative "./lib/azure/storage/file/version"
2929

3030
Gem::Specification.new do |s|
3131
s.name = "azure-storage-file"
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
3636
s.summary = "Official Ruby client library to consume Azure Storage File service"
3737
s.homepage = "http://github.com/azure/azure-storage-ruby"
3838
s.license = "MIT"
39-
s.files = `git ls-files ./file/lib/azure/storage/file`.split("\n") << "file/lib/azure/storage/file.rb"
39+
s.files = `git ls-files ./lib/azure/storage/file`.split("\n") << "./lib/azure/storage/file.rb"
4040

4141
s.required_ruby_version = ">= 1.9.3"
4242

0 commit comments

Comments
 (0)