diff --git a/Gemfile b/Gemfile index 435a351..318ca13 100644 --- a/Gemfile +++ b/Gemfile @@ -5,9 +5,9 @@ gem 'colored', '~> 1.2' gem 'git', require: false gem 'openstudio-aws', '0.5.0.rc1' -gem 'openstudio-analysis', '~> 0.4.5' +# gem 'openstudio-analysis', '~> 0.4.5' # gem 'openstudio-analysis', path: '../OpenStudio-analysis-gem' -# gem 'openstudio-analysis', github: 'nrel/openstudio-analysis-gem', branch: 'develop' +gem 'openstudio-analysis', github: 'nrel/openstudio-analysis-gem', branch: 'develop' gem 'nokogiri', '1.6.8.1' diff --git a/Gemfile.lock b/Gemfile.lock index e1acf88..aef4745 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,17 @@ +GIT + remote: git://github.com/nrel/openstudio-analysis-gem.git + revision: 4932e2403a2433efa0d2b9f292eb4781fc1cf9fe + branch: develop + specs: + openstudio-analysis (1.0.0.rc14) + bcl (~> 0.5.7) + dencity (~> 0.1.0) + faraday (~> 0.8) + nokogiri (~> 1.6) + roo (~> 2.4) + rubyzip (~> 1.2) + semantic (~> 1.4) + GEM remote: http://rubygems.org/ specs: @@ -20,8 +34,16 @@ GEM zliby builder (3.2.3) colored (1.2) + dencity (0.1.0) + faraday + faraday_middleware + hashie + multi_json + parallel faraday (0.11.0) multipart-post (>= 1.2, < 3) + faraday_middleware (0.11.0.1) + faraday (>= 0.7.4, < 1.0) git (1.3.0) hashie (3.5.1) jmespath (1.3.1) @@ -41,34 +63,24 @@ GEM mini_portile2 (~> 2.1.0) nokogiri (1.6.8.1-x64-mingw32) mini_portile2 (~> 2.1.0) - openstudio-analysis (0.4.5) - bcl (~> 0.5.5) - faraday (~> 0.8) - nokogiri (~> 1.6) - roo (~> 1.12) - rubyzip (~> 1.0) - semantic (~> 1.4) openstudio-aws (0.5.0.rc1) aws-sdk-core (= 2.2.26) net-scp (~> 1.1) net-ssh (= 3.0.2) semantic (~> 1.4) sshkey (~> 1.7) + parallel (1.10.0) powerbar (1.0.18) hashie (>= 1.1.0) rake (11.3.0) - roo (1.13.2) - nokogiri - rubyzip - spreadsheet (> 0.6.4) - ruby-ole (1.2.12) + roo (2.7.1) + nokogiri (~> 1) + rubyzip (~> 1.1, < 2.0.0) rubyXL (3.3.22) nokogiri (>= 1.4.4) rubyzip (>= 1.1.6) rubyzip (1.2.0) semantic (1.6.0) - spreadsheet (1.1.4) - ruby-ole (>= 1.0) sshkey (1.9.0) systemu (2.6.5) uuid (2.3.8) @@ -84,7 +96,7 @@ DEPENDENCIES colored (~> 1.2) git nokogiri (= 1.6.8.1) - openstudio-analysis (~> 0.4.5) + openstudio-analysis! openstudio-aws (= 0.5.0.rc1) rake (~> 11.1)