briar 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaf304a90587be28da7a57ebd986d640a20048c8
-  data.tar.gz: bb95f76e74bf2aea4e661e25e7f6ea5af6c22e69
+  metadata.gz: 1cc260e40fac68371ccb3095307b14b05d06eaf7
+  data.tar.gz: ad2381e57a1196b80f1ebde90aba7891d3e65b7f
 SHA512:
-  metadata.gz: 3acc84bc94229996cdedfb6a1477f1e4f1de73b2e5a244be0cddd26196d36f51eecb2840b8c2e2492608d56c1364521495667db6a6f72aeb7ad124c94201aef5
-  data.tar.gz: 718fa8ffae6504a4091a7bbb7a09a13abaf377051ec82e8981a8bf477a4d0424277e8a0b2f4cabae4f092a6683a0f6771871027961850571e3aa1d75a93b03cf
+  metadata.gz: 27fa66df0a42df249ccf8a08b31f2dfa130aa0299d475daab98fcb745acb7f006490d7a1c0a4b8537ac7b108fe4f058622722c33efb69df32186a776b4d92de9
+  data.tar.gz: 23466b32c03c4eb1aeed17e1815c12bb0a042734aa0a22dcf1ee1af1907e4248ac999cbd2df2f415bb6e04174c03346b2b43f11128c6426928c82915f475ad0f

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.3.1
+
+* $ briar install calabash-server only installs the framework
+
 ### 1.3.0
 
 * Stop munging the load path #51

data/bin/briar_install.rb

@@ -68,28 +68,19 @@ def briar_install_calabash_server
     exit 1
   end
 
-  gem_dir = expect_calabash_gem_path
   server_dir = expect_calabash_server_path
 
-  version_file = File.read("#{server_dir}/calabash/Classes/FranklyServer/Routes/LPVersionRoute.h")
-  tokens = version_file.split(/define kLPCALABASHVERSION/)
-  line = tokens[1].split("\n").first
-  version_part = line.split(' ').last
-  version = version_part.tr('^A-Za-z0-9.\-\_', '')
-
-  puts "building calabash server using 'rake build_server'"
-  system("cd #{gem_dir}; rake build_server")
-  puts 'remove old cal simulator targets'
-  briar_rm(['sim-targets'])
-  puts 'copying new framework to ./'
-  system("cp #{gem_dir}/staticlib/#{cal_framework}.zip ./")
-  puts 'removing old framework'
-  system("rm -rf #{cal_framework}")
-  puts 'unzipping new framework'
-  system("unzip #{cal_framework}.zip")
-  puts 'cleaning up'
-  system("rm -rf #{cal_framework}.zip")
-  puts "installed new server version '#{version}'"
+  Dir.chdir(server_dir) do
+    system('make', 'framework')
+  end
+
+  puts 'Removing the old framework'
+  system('rm', *['-rf', cal_framework])
+
+  puts 'Moving the new framework into place'
+  system('mv', *[File.join(server_dir, 'calabash.framework'), './'])
+
+  puts "Installed #{`calabash.framework/Resources/version`.strip}"
 end
 
 
@@ -123,4 +114,4 @@ end
 
 def briar_device_install(device)
   ideviceinstaller(device, :install)
-end
+end

data/lib/briar/version.rb

@@ -1,3 +1,3 @@
 module Briar
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: briar
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Joshua Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-03 00:00:00.000000000 Z
+date: 2015-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbx-require-relative
@@ -395,9 +395,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: briar-1.3.0
+summary: briar-1.3.1
 test_files: []
 has_rdoc: