briar 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93b78e9220f5ac82c9969b36e7c5c9652f5b65da
-  data.tar.gz: be309fdb8ca3bce430a999e9617d2dc09139e081
+  metadata.gz: 7f374a08826fb7d8631082e58c303fd641e5abb4
+  data.tar.gz: dc9631ef4de35c767bdfe180131bab727ded2b02
 SHA512:
-  metadata.gz: 06537974ce19123e97d7f5f68efdf0ebe12defe0e5721e66d815bb15f52d3ce11c457453ff0a296f14faae3e3da9e23d68ceeeb842b5702e326692d47e638d5f
-  data.tar.gz: 7a698ad9fbc1a521b0442700f7851d74e437bcd4cdc056d825944ec45856c312002c9d2f97c8e3d046e17703c05f203722690458f9330d0e2ef79f494f5431e1
+  metadata.gz: a363d592011d1c37a410191390dd81cc14ba169d367eae7c46102397f4ff2acb4fae8f5aeabe6ff2751ecdb8d4350190dadeeb1f738bc98033e34c833a065704
+  data.tar.gz: 01a34587d3a18c605b088d6d81dc315963e1f4f721358c55332fa2be2bc73b414c7c58767ac93b7bfa0a89975d7cd26408c46b8b5b8ebffc9f9f10b93cdb6b0d

data/README.md

@@ -25,13 +25,17 @@ Requires ruby >= 1.9.3; ruby 2.1.2 is recommended.
 In your Gemfile:
 
 ```
-gem 'briar', '~>1.1'
+gem 'briar', '~> 1.1.2'
+
+# to use the briar XTC developer tools, include rake
+gem 'rake', '~> 10.3'
 ```
 
 In your `features/support/env.rb` file:
 
 ```
 require 'calabash-cucumber/cucumber'
+ENV['NO_BRIAR_PREDEFINED_STEPS'] = '1'
 require 'briar/cucumber'
 
 # optional
@@ -80,21 +84,27 @@ $ briar rm sim-targets
 $ briar rm dups 
 $ briar rm dups briar-ios-example 
 
-# change the simulator version
+# change the simulator version (will be deprecated soon)
 $ briar sim ipad_r
 $ briar sim iphone_4in
 ```
 
 ## Xamarin Test Cloud
 
-There is currently an issue with using briar predefined steps on the XTC:
+Requires adopting the .xamarin convention and a .env file.  See the help for `.xamarin` and `xtc`.
 
 ```
-# fails validation step 
-Then I touch the "time" row
+# list the currently cached device in ~/.xamarin/test-cloud/ios-sets.csv
+$ briar xtc
+
+# submit a job to the iPads device set
+$ briar xtc iPads
+
+# submit a job to the iPhones device set with the meal_log profile
+$ briar xtc iPhones meal_log
 ```
 
-## version numbers
+## Version Numbers
 
 I will try my best to follow Semantic Versioning [1] when naming the versions.
 
@@ -111,14 +121,12 @@ _"But returning to the practical: No release version of SemVer is compatible wit
 * http://en.wikipedia.org/wiki/Smoking_pipe_(tobacco)#Calabash
 * http://en.wikipedia.org/wiki/Smoking_pipe_(tobacco)#Briar
 
-## Road Map
-
-I am thinking of dropping all the of predefined steps!  Beware!  You have been warned!
-
 ## Contributing
 
 1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
+2. Create your feature branch (`git checkout -b feature/my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
+4. Push to the branch (`git push -u origin feature/my-new-feature`)
 5. Create new Pull Request
+
+Please do not change the version number.

data/bin/briar_ideviceinstaller.rb

@@ -40,7 +40,7 @@ module Briar
             briar_remove_derived_data_dups
           end
 
-          ipa = merged[:ipa]
+          ipa = File.expand_path(merged[:ipa])
           expect_ipa(ipa)
 
           Retriable.retriable do
@@ -63,7 +63,8 @@ module Briar
 
     def bundle_installed?(udid, bundle_id, installer)
       cmd = "#{installer} -u #{udid} -l"
-      puts "#{Rainbow(cmd).green}"
+      info = "EXEC: #{cmd}"
+      puts "#{Rainbow(info).cyan}"
       `#{cmd}`.strip.split(/\s/).include? bundle_id
     end
 
@@ -74,6 +75,8 @@ module Briar
       end
 
       cmd = "#{installer} -u #{udid} --install #{ipa}"
+      info = "EXEC: #{cmd}"
+      puts "#{Rainbow(info).cyan}"
       system cmd
       unless bundle_installed?(udid, bundle_id, installer)
         raise "could not install '#{ipa}' on '#{udid}' with '#{bundle_id}'"
@@ -87,6 +90,8 @@ module Briar
         return true
       end
       cmd = "#{installer} -u #{udid} --uninstall #{bundle_id}"
+      info = "EXEC: #{cmd}"
+      puts "#{Rainbow(info).cyan}"
       system cmd
       if bundle_installed?(udid, bundle_id, installer)
         raise "could not uninstall '#{bundle_id}' on '#{udid}'"

data/bin/briar_install.rb

@@ -1,7 +1,7 @@
 require_relative 'briar_help'
 require_relative 'briar_dot_xamarin'
 require_relative 'briar_ideviceinstaller'
-require 'pry'
+
 
 require 'ansi/logger'
 @log = ANSI::Logger.new(STDOUT)

data/bin/briar_xtc.rb

@@ -6,35 +6,6 @@ require 'ansi/logger'
 
 @log = ANSI::Logger.new(STDOUT)
 
-# not yet - maybe never
-##use <tt>rake install</tt> to install a gem at +path_to_gemspec+
-## returns the version of the gem installed
-#def rake_install_gem(path_to_gemspec)
-#
-#  #out = `"cd #{path_to_gemspec}; rake install"`
-#
-#  out = nil
-#  Dir.chdir(File.expand_path(path_to_gemspec)) do
-#    system 'rake install'
-#  end
-#
-#
-#  #cmd = "cd #{path_to_gemspec} ; rake install"
-#  #output = []
-#  #IO.popen(cmd).each do |line|
-#  #  p line.chomp
-#  #  output << line.chomp
-#  #end
-#
-#  puts "out = '#{out}'"
-#  exit 1
-#  tokens = out.split(' ')
-#  gem = tokens[0]
-#  version = tokens[1]
-#  @log.info { "installed #{gem} #{version}" }
-#  version
-#end
-
 def briar_xtc_submit(device_set, profile, opts={})
   default_opts = {:build_script => ENV['IPA_BUILD_SCRIPT'],
                   :ipa => ENV['IPA'],
@@ -42,13 +13,12 @@ def briar_xtc_submit(device_set, profile, opts={})
                   :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'] == '0',
-                  :calabash_dev => ENV['XTC_CALABASH_GEM_DEV'] == '0',
+                  :briar_dev => ENV['XTC_BRIAR_GEM_DEV'] == '1',
+                  :calabash_dev => ENV['XTC_CALABASH_GEM_DEV'] == '1',
                   :async_submit => ENV['XTC_WAIT_FOR_RESULTS'] == '0',
                   :series => ENV['XTC_SERIES'],
                   :rebuild => true}
 
-
   opts = default_opts.merge(opts)
 
   build_script = opts[:build_script]
@@ -67,22 +37,24 @@ def briar_xtc_submit(device_set, profile, opts={})
   account = opts[:account]
   api_key = read_api_token(account)
 
-  if opts[:briar_dev]
-    briar_path = `bundle show briar`.strip
-    system('gem uninstall -Vax --force --no-abort-on-dependent briar',
-           :err => '/dev/null')
-    Dir.chdir(File.expand_path(briar_path)) do
-      system 'bundle exec rake install'
-    end
-  end
+  # ugh.  it works, then it doesn't
+  # i think the real solution is to pull the bin/tools out of the gem and into
+  # (yet) another gem.
+  # if opts[:briar_dev]
+  #   briar_path = `bundle show briar`.strip
+  #   # system('gem uninstall -Vax --force --no-abort-on-dependent briar',
+  #   #        :err => '/dev/null')
+  #   Dir.chdir(File.expand_path(briar_path)) do
+  #     system 'gem rake install'
+  #   end
+  # end
 
   if opts[:calabash_dev]
     calabash_path = `bundle show calabash-cucumber`.strip
     system('gem uninstall -Vax --force --no-abort-on-dependent calabash-cucumber',
            :err => '/dev/null')
-
     Dir.chdir(File.expand_path(calabash_path)) do
-      system 'bundle exec rake install'
+      system 'rake install'
     end
   end
 
@@ -146,7 +118,7 @@ def briar_xtc_submit(device_set, profile, opts={})
 
   ipa = File.basename(File.expand_path(expect_ipa(opts[:ipa])))
 
-  cmd = "bundle exec test-cloud submit #{ipa} #{api_key} -d #{device_set} -c cucumber.yml -p #{profile} #{wait} #{series}"
+  cmd = "test-cloud submit #{ipa} #{api_key} -d #{device_set} -c cucumber.yml -p #{profile} #{wait} #{series}"
 
   puts Rainbow("cd #{staging_dir}; #{cmd}").green
   Dir.chdir(staging_dir) do

data/briar.gemspec

@@ -22,29 +22,31 @@ Gem::Specification.new do |gem|
   gem.homepage = 'https://github.com/jmoody/briar'
   gem.license = 'MIT'
 
+  gem.files = `git ls-files`.split("\n") - ['.gitignore']
+  gem.executables = 'briar'
+  gem.require_paths = ['lib', 'features']
+
   gem.platform = Gem::Platform::RUBY
   gem.required_ruby_version = '>= 1.9.3'
 
   gem.add_runtime_dependency 'rbx-require-relative', '~> 0.0'
-  gem.add_runtime_dependency 'calabash-cucumber', '< 0.11', '> 0.9.169'
+  gem.add_runtime_dependency 'calabash-cucumber', '>= 0.9.168'
   gem.add_runtime_dependency 'dotenv', '~> 0.9'
   gem.add_runtime_dependency 'ansi', '~> 1.4'
   gem.add_runtime_dependency 'rainbow', '~> 2.0'
-  gem.add_runtime_dependency 'xcpretty', '~> 0.1'
   # downgrade because of xtc gem - wants ~> 1.4
-  gem.add_runtime_dependency 'retriable', '~> 1.3'
-  gem.add_runtime_dependency 'bundler', '~> 1.6'
-  gem.add_runtime_dependency 'xamarin-test-cloud', '~> 0.9', '>= 0.9.35'
+  gem.add_runtime_dependency 'retriable', '< 1.5', '>= 1.3'
+  # test cloud requires 1.3.5, we want ~> 1.6
+  gem.add_runtime_dependency 'bundler', '< 1.7', '>= 1.3.5'
+  gem.add_runtime_dependency 'xamarin-test-cloud', '< 1.0', '>= 0.9.35'
+  gem.add_runtime_dependency 'rake', '~> 10.3'
 
   # downgrading to 1.0.0 from 1.2.0
   # https://github.com/xamarin/test-cloud-command-line/issues/3
   gem.add_runtime_dependency 'syntax', '~>1.0'
 
-  gem.add_development_dependency('travis', '~> 1.7')
-  gem.add_development_dependency('yard', '~> 0.8')
-  gem.add_development_dependency('rake', '~> 10.3')
+  gem.add_development_dependency 'travis', '~> 1.7'
+  gem.add_development_dependency 'yard', '~> 0.8'
+  gem.add_development_dependency 'xcpretty', '0.1.6'
 
-  gem.files = `git ls-files`.split("\n") - ['.gitignore']
-  gem.executables = 'briar'
-  gem.require_paths = ['lib', 'features']
 end

data/changelog/1.1.2.md

@@ -0,0 +1,13 @@
+## 1.1.2 changelog
+
+I goofed.  1.1.1 has a bad gemspec and some critical bugs.
+
+## Features
+
+### Improvements to `briar xtc`
+
+* Adds support for targeting XTC series.
+* Can now wait run xtc as async or sync.
+* Adjusts how and when bundler is called when submitted an XTC job.
+
+See `$ briar help xtc`.

data/lib/briar/email.rb

@@ -65,9 +65,10 @@ module Briar
       addrs.include? address
     end
 
+    # @todo replace sleep with a wait_*
     def should_see_recipients (addresses)
       should_see_mail_view
-      wait_for_animation
+      sleep(0.4)
       addrs = addresses.split(/, ?/)
       addrs.each do |expected|
         unless email_to_contains? expected.strip

data/lib/briar/irbrc.rb

@@ -1,8 +1,6 @@
-require 'rubygems'
 require 'irb/completion'
 require 'irb/ext/save-history'
 require 'awesome_print'
-require 'pry'
 
 AwesomePrint.irb!
 

data/lib/briar/version.rb

@@ -1,3 +1,3 @@
 module Briar
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: briar
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Joshua Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbx-require-relative
@@ -28,22 +28,16 @@ dependencies:
   name: calabash-cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.11'
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.169
+        version: 0.9.168
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.11'
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.169
+        version: 0.9.168
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -86,55 +80,53 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: xcpretty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: retriable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: xamarin-test-cloud
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.35
@@ -142,12 +134,26 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.35
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: syntax
   requirement: !ruby/object:Gem::Requirement
@@ -191,19 +197,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: xcpretty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: 0.1.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: 0.1.6
 description: extends calabash-ios steps
 email:
 - joshuajmoody@gmail.com
@@ -232,6 +238,7 @@ files:
 - briar.gemspec
 - changelog/1.1.0.md
 - changelog/1.1.1.md
+- changelog/1.1.2.md
 - changelog/1.2.0.md
 - features/step_definitions/alerts_and_sheets/action_sheet_steps.rb
 - features/step_definitions/alerts_and_sheets/alert_view_steps.rb
@@ -312,6 +319,6 @@ rubyforge_project:
 rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
-summary: briar-1.1.1
+summary: briar-1.1.2
 test_files: []
 has_rdoc: