briar 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd551eeb73273fbcc915591455f9630b7400182e
-  data.tar.gz: 0a67f0f572881d6351092ec105a6591075dc42f8
+  metadata.gz: b7dab5c94d2a903dc24b84bbf85c24f3654180cb
+  data.tar.gz: 2c47762c151da5fd494f033dbf4ed4760ce3d706
 SHA512:
-  metadata.gz: e9dffa137f2c76b87b1597cdf8043ba1ac87094f33dc464b3d2fff0773387d17964a7c1cc3723375b3fd8c040588a623635deb09827be5c8d21a821a70a71649
-  data.tar.gz: 2de61c5013c282bb63c21e77a0e3fc5dad587e08a257a191d77df17398ebb58c3e3f497b02bf98407ec924c10052463bc6fc436ee8597358e835d004a77dbedf
+  metadata.gz: 31dc7a2637f9042087f3d8fd7ee9b7fd4f02ef05fbf0a6a0cc2917dbd08d43cbfb619f51947fca41afb6657a4c85e0dd62a3ea07dc4d4e37c7d42e877b01794a
+  data.tar.gz: b8a4d8557c0df97feb1ee5245bdbcfdcd6b1e0a895b4a5ec106e2b594f0f02194a7882b659d808d2579b573e5dbe89d7114b4d598b47683a85dbac6b288a982c

data/README.md

@@ -4,7 +4,7 @@ Briar Extends the steps defined in [calabash-ios](https://github.com/calabash/ca
 
 ### WARNING: briar is not trying to provide steps that will work for every project
 
-Every project should cultivate its own [venacular](http://en.wikipedia.org/wiki/Vernacular) - 
+Every project should cultivate its own [vernacular](http://en.wikipedia.org/wiki/Vernacular) - 
 a shared language between developers, clients, and users.  The [steps that briar provides](features/step_definitions) are not meant to be dropped into into your projects (although they can be).  Briar provides a library of ruby methods to build application-specific steps from.  The steps in the features directory are meant to be examples of what briar can offer.
 
 To see briar in action, take a look at https://github.com/jmoody/briar-ios-example

data/bin/briar_ideviceinstaller.rb

@@ -4,47 +4,95 @@ require_relative './briar_env'
 
 require 'rainbow'
 require 'ansi/logger'
+require 'retriable'
 
 @log = ANSI::Logger.new(STDOUT)
 
-def ideviceinstaller(device, cmd, opts={})
-  default_opts = {:build_script => ENV['IPA_BUILD_SCRIPT'],
-                  :ipa => ENV['IPA'],
-                  :bundle_id => expect_bundle_id(),
-                  :idevice_installer => expect_ideviceinstaller()}
-  opts = default_opts.merge(opts)
+module Briar
+  module IDEVICEINSTALLER
 
-  cmds = [:install, :uninstall, :reinstall]
-  unless cmds.include? cmd
-    raise "illegal option '#{cmd}' must be one of '#{cmds}'"
-  end
+    include Calabash::Cucumber::Logging
+
+    def ideviceinstaller(device, cmd, opts={})
+      default_opts = {:build_script => ENV['IPA_BUILD_SCRIPT'],
+                      :ipa => ENV['IPA'],
+                      :bundle_id => expect_bundle_id(),
+                      :idevice_installer => expect_ideviceinstaller()}
+      merged = default_opts.merge(opts)
+
+      cmds = [:install, :uninstall, :reinstall]
+      unless cmds.include? cmd
+        raise "illegal option '#{cmd}' must be one of '#{cmds}'"
+      end
+
+      build_script = merged[:build_script]
+      expect_build_script(build_script) if build_script
 
-  build_script = opts[:build_script]
-  expect_build_script(build_script) if build_script
+      udid =  read_device_info(device, :udid)
 
-  udid =  read_device_info(device, :udid)
+      bin_path = merged[:idevice_installer]
+      bundle_id = merged[:bundle_id]
 
-  bin_path = opts[:idevice_installer]
+      case cmd
+        when :install
+          if build_script
+            system "#{build_script}"
+            briar_remove_derived_data_dups
+          end
 
-  if cmd == :install
-    if build_script
-      system "#{build_script}"
-      briar_remove_derived_data_dups
+          ipa = merged[:ipa]
+          expect_ipa(ipa)
+
+          Retriable.retriable do
+            uninstall udid, bundle_id, bin_path
+          end
+
+          Retriable.retriable do
+            install udid, ipa, bundle_id, bin_path
+          end
+        when :uninstall
+          Retriable.retriable do
+            uninstall udid, bundle_id, bin_path
+          end
+        when :reinstall
+          _deprecated('1.1.0', ':reinstall arg has been deprecated; use :install instead', :warn)
+          ideviceinstaller device, :install
+      end
     end
 
-    ipa = opts[:ipa]
-    expect_ipa(ipa)
-
-    cmd = "#{bin_path} -u #{udid} --install #{ipa}"
-    puts "#{Rainbow(cmd).green}"
-    system cmd
-  elsif cmd == :uninstall
-    bundle_id = opts[:bundle_id]
-    cmd = "#{bin_path} -u #{udid} --uninstall #{bundle_id}"
-    puts "#{Rainbow(cmd).green}"
-    system cmd
-  else
-    ideviceinstaller(device, :uninstall)
-    ideviceinstaller(device, :install)
+
+    def bundle_installed?(udid, bundle_id, installer)
+      cmd = "#{installer} -u #{udid} -l"
+      puts "#{Rainbow(cmd).green}"
+      `#{cmd}`.strip.split(/\s/).include? bundle_id
+    end
+
+    def install(udid, ipa, bundle_id, installer)
+      if bundle_installed? udid, bundle_id, installer
+        puts "#{Rainbow("bundle '#{bundle_id}' is already installed").green}"
+        return true
+      end
+
+      cmd = "#{installer} -u #{udid} --install #{ipa}"
+      system cmd
+      unless bundle_installed?(udid, bundle_id, installer)
+        raise "could not install '#{ipa}' on '#{udid}' with '#{bundle_id}'"
+      end
+      true
+    end
+
+
+    def uninstall(udid, bundle_id, installer)
+      unless bundle_installed? udid, bundle_id, installer
+        return true
+      end
+      cmd = "#{installer} -u #{udid} --uninstall #{bundle_id}"
+      system cmd
+      if bundle_installed?(udid, bundle_id, installer)
+        raise "could not uninstall '#{bundle_id}' on '#{udid}'"
+      end
+      true
+    end
   end
 end
+

data/bin/briar_install.rb

@@ -6,6 +6,8 @@ require 'pry'
 require 'ansi/logger'
 @log = ANSI::Logger.new(STDOUT)
 
+include Briar::IDEVICEINSTALLER
+
 def briar_install_gem
   warn_deprecated('0.1.3', 'will be removed')
   puts 'will install briar gem'
@@ -120,5 +122,5 @@ def briar_install(args)
 end
 
 def briar_device_install(device)
-  ideviceinstaller(device, :reinstall)
+  ideviceinstaller(device, :install)
 end

data/bin/briar_xtc.rb

@@ -44,6 +44,7 @@ def briar_xtc_submit(device_set, profile, opts={})
                   :xtc_staging_dir => expect_xtc_staging_dir(),
                   :briar_dev => ENV['XTC_BRIAR_GEM_DEV'] == '1',
                   :calabash_dev => ENV['XTC_CALABASH_GEM_DEV'] == '1',
+                  :async_submit => ENV['XTC_WAIT_FOR_RESULTS'] == '0',
                   :rebuild => true}
 
 
@@ -70,7 +71,7 @@ def briar_xtc_submit(device_set, profile, opts={})
     system('gem uninstall briar --no-executables --ignore-dependencies --quiet',
            :err => '/dev/null')
     Dir.chdir(File.expand_path(briar_path)) do
-      system 'rake install'
+      system 'bundle exec rake install'
     end
   end
 
@@ -80,7 +81,7 @@ def briar_xtc_submit(device_set, profile, opts={})
            :err => '/dev/null')
 
     Dir.chdir(File.expand_path(calabash_path)) do
-      system 'rake install'
+      system 'bundle exec rake install'
     end
   end
 
@@ -94,7 +95,13 @@ def briar_xtc_submit(device_set, profile, opts={})
     end
   end
 
-  xtc_gemfile = "#{opts[:xtc_staging_dir]}/Gemfile"
+  staging_dir = opts[:xtc_staging_dir]
+  unless File.exists?(File.expand_path(staging_dir))
+    @log.fatal{ "XTC_STAGING_DIR => '#{staging_dir}' does not exist" }
+    exit 1
+  end
+
+  xtc_gemfile = "#{staging_dir}/Gemfile"
 
   File.open(xtc_gemfile, 'w') do |file|
     file.write("source 'https://rubygems.org'\n")
@@ -124,11 +131,19 @@ def briar_xtc_submit(device_set, profile, opts={})
 
   profile = 'default' if profile.nil?
 
+  if opts[:async_submit]
+    wait = '--async'
+  else
+    wait = '--no-async'
+  end
+
   ipa = File.basename(File.expand_path(expect_ipa(opts[:ipa])))
 
-  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(opts[:xtc_staging_dir]) do
+  cmd = "bundle exec test-cloud submit #{ipa} #{api_key} -d #{device_set} -c cucumber.yml -p #{profile} #{wait}"
+
+  puts Rainbow("cd #{staging_dir}; #{cmd}").green
+  Dir.chdir(staging_dir) do
+    system 'bundle install'
     exec cmd
   end
 end

data/briar.gemspec

@@ -3,7 +3,7 @@
 # ==> require_relative 'lib/briar/version' <==
 # bundler on 1.9.3 complains
 # 'Does it try to require a relative path? That's been removed in Ruby 1.9'
-# 
+#
 # this is the current _best_ solution
 $:.push File.expand_path('../lib', __FILE__)
 require 'briar/version'
@@ -23,20 +23,26 @@ Gem::Specification.new do |gem|
   gem.license = 'MIT'
 
   gem.platform = Gem::Platform::RUBY
-  gem.required_ruby_version = '>= 1.8.7'
+  gem.required_ruby_version = '>= 1.9.3'
 
   gem.add_runtime_dependency 'rbx-require-relative', '~> 0.0'
-  gem.add_runtime_dependency 'calabash-cucumber', '~> 0.9.169.pre5'
-  gem.add_runtime_dependency 'rake', '~>10.1'
+  gem.add_runtime_dependency 'calabash-cucumber', '~> 0.9.169'
   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'
+  gem.add_runtime_dependency 'xcpretty', '~> 0.1'
+  # downgrade because of xtc gem
+  gem.add_runtime_dependency 'retriable', '~> 1.3'
+  gem.add_runtime_dependency 'bundler', '~> 1.6'
+
 
   # 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.0'
+  gem.add_runtime_dependency 'syntax', '~>1.0'
+
+  gem.add_runtime_dependency 'pry', '~> 0.10'
+  gem.add_development_dependency('yard', '~> 0.8')
+  gem.add_development_dependency('rake', '~> 10.3')
 
   gem.files = `git ls-files`.split("\n") - ['.gitignore']
   gem.executables = 'briar'

data/changelog/1.1.0.md

@@ -0,0 +1,23 @@
+## 1.1.0 changelog
+
+This release improves the `$ briar install < device >` and `$ briar xtc` commands.
+
+Briar now depends on bundler.  Calls to 3rd party gem binaries will be executed in the context of `bundle exec`.
+
+Briar now requires ruby 1.9.3 or higher.  Ruby 1.8.7 is no longer supported.
+
+## features
+
+* [pull 8](https://github.com/jmoody/briar/pull/8) added language keys for Danish and Thai
+    - thanks @crishoj
+
+* [pull 12](https://github.com/jmoody/briar/pull/12) briar now retries ideviceinstaller commands on failures
+
+* [pull 13](https://github.com/jmoody/briar/pull/13) briar xtc command now executes all commands in the context of `bundle exec`
+
+* [pull 14](https://github.com/jmoody/briar/pull/14) briar is dropping support for ruby 1.8.7
+
+## deprecated
+
+- 1.1.0 `:reinstall` is no longer a valid `ideviceinstaller` command - `:install` will always delete the existing .ipa from the device and reinstall.
+- 1.1.0 drops ruby 1.8.7 support

data/changelog/1.1.1.md

@@ -0,0 +1,14 @@
+## 1.1.1 changelog
+
+## release requirements
+
+*** @required ***
+
+- [ ] update cli help docs around XTC_WAIT_FOR_RESULTS
+- [ ] need support for profiles
+- [ ] need support for opening consoles against different simulators
+- [ ] check calabash version!
+
+*** @optional ***
+
+## features

data/lib/briar/keyboard/uia_keyboard_language.rb

@@ -9,6 +9,8 @@ module Briar
       BRIAR_LANGUAGE_KEYS = {
             :en => 'space',
             :de => 'Leerzeichen',
+            :da => 'mellemrum',
+            :th => 'วรรค',
             # could not decide what the language code should be (alt was ja-JP)
             :ja => '空白'
       }

data/lib/briar/version.rb

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

metadata

@@ -1,141 +1,183 @@
 --- !ruby/object:Gem::Specification
 name: briar
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Joshua Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-10 00:00:00.000000000 Z
+date: 2014-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbx-require-relative
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
 - !ruby/object:Gem::Dependency
   name: calabash-cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.169.pre5
+        version: 0.9.169
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.169.pre5
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.1'
+        version: 0.9.169
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: ansi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.99'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.99'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: xcpretty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: retriable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: syntax
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '10.3'
 description: extends calabash-ios steps
 email:
 - joshuajmoody@gmail.com
@@ -162,6 +204,8 @@ files:
 - bin/briar_tags.rb
 - bin/briar_xtc.rb
 - briar.gemspec
+- changelog/1.1.0.md
+- changelog/1.1.1.md
 - features/step_definitions/alerts_and_sheets/action_sheet_steps.rb
 - features/step_definitions/alerts_and_sheets/alert_view_steps.rb
 - features/step_definitions/bars/navbar_steps.rb
@@ -228,19 +272,20 @@ require_paths:
 - features
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
-summary: briar-1.0.1
+summary: briar-1.1.0
 test_files:
 - spec/spec_helper.rb
+has_rdoc: