briar 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 901289dc9a3b8259898a611334c285ee323a15e6
-  data.tar.gz: e6c3f9351f3e87a8d8d371181bb8c91eb3324154
+  metadata.gz: dd551eeb73273fbcc915591455f9630b7400182e
+  data.tar.gz: 0a67f0f572881d6351092ec105a6591075dc42f8
 SHA512:
-  metadata.gz: ad655285ed8e88e51cff1dfc8542dbcf5c5bb1fc0159ae8e261fb2901516bc52f91db36564008a5eb464e4b03999c3794f104a80a5d66130a5519d0aa708d2a5
-  data.tar.gz: 702eaab3f5e1e8114e7b792062400bb9a0e6145cda45a6ef5658fee56d780bc3458c98d194393d5efdb5417cda85af827c0cf0cc840c66e21a503513cd9d4058
+  metadata.gz: e9dffa137f2c76b87b1597cdf8043ba1ac87094f33dc464b3d2fff0773387d17964a7c1cc3723375b3fd8c040588a623635deb09827be5c8d21a821a70a71649
+  data.tar.gz: 2de61c5013c282bb63c21e77a0e3fc5dad587e08a257a191d77df17398ebb58c3e3f497b02bf98407ec924c10052463bc6fc436ee8597358e835d004a77dbedf

data/bin/briar_env.rb

@@ -48,5 +48,11 @@ def expect_xtc_account
   account
 end
 
-
-
+def expect_xtc_staging_dir
+  dir = ENV['XTC_STAGING_DIR']
+  unless dir
+    @log.fatal{ 'XTC_STAGING_DIR must be set' }
+    exit 1
+  end
+  dir
+end

data/bin/briar_help.rb

@@ -333,6 +333,7 @@ def print_xtc_help
   #{help_env_var(' XTC_OTHER_GEMS_FILE', 'path to a file describing other gems that should be installed on the XTC')}
   #{help_env_var('   XTC_BRIAR_GEM_DEV', "set to '1' to ensure the local version of briar will be uploaded to the XTC'")}
   #{help_env_var('XTC_CALABASH_GEM_DEV', "set to '1' to ensure the local version of calabash will be uploaded to the XTC'")}
+  #{help_env_var('     XTC_STAGING_DIR', 'path to the directory where XTC files will be staged')}
 
 EOF
 end

data/bin/briar_xtc.rb

@@ -41,6 +41,7 @@ def briar_xtc_submit(device_set, profile, opts={})
                   :profiles => ENV['XTC_PROFILES'],
                   :account => expect_xtc_account(),
                   :other_gems => ENV['XTC_OTHER_GEMS_FILE'],
+                  :xtc_staging_dir => expect_xtc_staging_dir(),
                   :briar_dev => ENV['XTC_BRIAR_GEM_DEV'] == '1',
                   :calabash_dev => ENV['XTC_CALABASH_GEM_DEV'] == '1',
                   :rebuild => true}
@@ -93,31 +94,27 @@ def briar_xtc_submit(device_set, profile, opts={})
     end
   end
 
-  if opts[:briar_dev] or opts[:calabash_dev]
-
-    xtc_gemfile = './xamarin/Gemfile'
-
-    File.open(xtc_gemfile, 'w') do |file|
-      file.write("source 'https://rubygems.org'\n")
-      if opts[:calabash_dev]
-        calabash_version = `bundle exec calabash-ios version`.strip
-        file.write("gem 'calabash-cucumber', '#{calabash_version}'\n")
-      else
-        file.write("gem 'calabash-cucumber'\n")
-      end
-
-      if opts[:briar_dev]
-        briar_version = `bundle exec briar version`.strip
-        file.write("gem 'briar', '#{briar_version}'\n")
-      else
-        file.write("gem 'briar'\n")
-      end
-
-      other_gems.each do |gem|
-        file.write("#{gem}\n")
-      end
+  xtc_gemfile = "#{opts[:xtc_staging_dir]}/Gemfile"
+
+  File.open(xtc_gemfile, 'w') do |file|
+    file.write("source 'https://rubygems.org'\n")
+    if opts[:briar_dev]
+      briar_version = `bundle exec briar version`.strip
+      file.write("gem 'briar', '#{briar_version}'\n")
+    else
+      file.write("gem 'briar'\n")
+    end
+
+    if opts[:calabash_dev]
+      calabash_version = `bundle exec calabash-ios version`.strip
+      file.write("gem 'calabash-cucumber', '#{calabash_version}'\n")
+    elsif not opts[:briar_dev]
+      file.write("gem 'calabash-cucumber'\n")
     end
 
+    other_gems.each do |gem|
+      file.write("#{gem}\n")
+    end
   end
 
   sets = read_device_sets
@@ -131,7 +128,7 @@ def briar_xtc_submit(device_set, profile, opts={})
 
   cmd = "DEBUG=0 test-cloud submit #{ipa} #{api_key} -d #{device_set} -c cucumber.yml -p #{profile}"
   puts Rainbow("cd xamarin; #{cmd}").green
-  Dir.chdir('./xamarin') do
+  Dir.chdir(opts[:xtc_staging_dir]) do
     exec cmd
   end
 end
@@ -165,4 +162,3 @@ def briar_xtc(args)
 
   briar_xtc_submit(device_set, profile, opts)
 end
-

data/briar.gemspec

@@ -26,12 +26,13 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.8.7'
 
   gem.add_runtime_dependency 'rbx-require-relative', '~> 0.0'
-  gem.add_runtime_dependency 'calabash-cucumber', '~> 0.9.169.pre2'
+  gem.add_runtime_dependency 'calabash-cucumber', '~> 0.9.169.pre5'
   gem.add_runtime_dependency 'rake', '~>10.1'
   gem.add_runtime_dependency 'dotenv', '~> 0.9'
   gem.add_runtime_dependency 'ansi', '~> 1.4'
   gem.add_runtime_dependency 'rainbow', '~> 1.99'
   gem.add_runtime_dependency 'pry', '~> 0.9'
+  gem.add_runtime_dependency 'rspec'
 
   # downgrading to 1.0.0 from 1.2.0
   # https://github.com/xamarin/test-cloud-command-line/issues/3

data/lib/briar/irbrc.rb

@@ -31,13 +31,13 @@ require 'calabash-cucumber'
 #noinspection RubyResolve
 require 'calabash-cucumber/operations'
 #noinspection RubyResolve
-require 'calabash-cucumber/launch/simulator_helper'
+require 'calabash-cucumber/launch/simulator_launcher'
 #noinspection RubyResolve
 require 'calabash-cucumber/launcher'
 #noinspection RubyResolve
 require 'calabash-cucumber/uia'
 
-SIM=Calabash::Cucumber::SimulatorHelper
+SIM=Calabash::Cucumber::SimulatorLauncher
 
 extend Calabash::Cucumber::Operations
 include Calabash::Cucumber::IPad

data/lib/briar/version.rb

@@ -1,3 +1,3 @@
 module Briar
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: briar
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Joshua Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-19 00:00:00.000000000 Z
+date: 2014-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbx-require-relative
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.169.pre2
+        version: 0.9.169.pre5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.169.pre2
+        version: 0.9.169.pre5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: syntax
   requirement: !ruby/object:Gem::Requirement
@@ -227,6 +241,6 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: briar-1.0.0
+summary: briar-1.0.1
 test_files:
 - spec/spec_helper.rb