Merge branch 'master' into baseline_improvement

ba-st · Mar 31, 2018 · a5e93fa · a5e93fa
2 parents 077120f + e767b85
commit a5e93fa
Show file tree

Hide file tree

Showing 16 changed files with 49 additions and 134 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,28 @@
 language: smalltalk
 sudo: false
-
-# Select operating system(s)
 os:
-  - linux
-
-# Select compatible Smalltalk image(s)
+- linux
 smalltalk:
-  - Pharo-7.0
-  - Pharo-6.1
-  - Pharo-6.0
-  - Pharo-5.0
+- Pharo64-7.0
+- Pharo-7.0
+- Pharo-6.1
+- Pharo-6.0
+- Pharo-5.0
+matrix:
+  allow_failures:
+  - smalltalk: Pharo64-7.0
+  - smalltalk: Pharo-7.0
+  fast_finish: true
+before_deploy:
+  - cp "${SMALLTALK_CI_IMAGE}" "Buoy.image"
+  - cp "${SMALLTALK_CI_CHANGES}" "Buoy.changes"
+  - zip -q "${TRAVIS_BRANCH}-${TRAVIS_SMALLTALK_VERSION}.zip" "Buoy.image" "Buoy.changes"
+deploy:
+  provider: releases
+  api_key:
+    secure: Eu7fhFGXq3Eavd7TGuv1hfCWGbEzAU+uSQBSyZXbYyO52aZfZcrfOszAiBVtOJVhm0fKlFYIrRGYIuYEvu2gyQF1yJ6V27urlXOiJcieYVauCX5/P8av2UG4/0HwAnrUYcXp7wq4rxhh/U8DEI+iFzzv9uSZucwpslOJr2I/fPRDryef2qfmbiOC2S51rKNbNplOt7X53TiVqE/yvjV4o+goeJ+qS0KmlxJnC7Gyd9VQaaHTojWAVPewavPeOtL6OSeRCZtHTYYF5Skfim6yE6zdkkrJWq7Z4Ykw3Y75BHMIrj4Sexrkns/zb3xWgo4T0wKuRgcFBE4mOOvo/mpM+grua2HXVZxz2uSTW4KG1iqmKdy3ESmMa8iVP4FVsg1EJxGWj0BJolEOShZ2O7Gb6fFGgvCvmKdM/k/3779plcPVTUuvrhKsXIY75Q6qEaEIIoAgHr2HBkanOrOkLA35ZUzm2e2p0daJjQfVybzOE7XZojBmXD6rebcqmjl7pt0r8yztxwxwXpxPtPPycB/Ex+ZzraLKHwNwt3kVcCLI65LWUWnUgV0FoiaVX6Ku5M7OC3ud/HnbFyOkRm7dKvArndARmiTpRlgSRH74F9NcvF5a4mqaxDnmJheBPZa9RUlDD/fc56oXd3U5lz5vgpG7KH1qu55NUaPrDaufKbjedQk=
+  file: "${TRAVIS_BRANCH}-${TRAVIS_SMALLTALK_VERSION}.zip"
+  skip_cleanup: true
+  on:
+    repo: ba-st/Buoy
+    tags: true
diff --git a/docs/BindingsAndOptionals.md b/docs/BindingsAndOptionals.md
@@ -44,6 +44,13 @@ fileOptional
 
 ### Combinations
 
+We can transform an optional:
+
+```smalltalk
+fileOptional return: [:file | file asUrl ]
+```
+This will produce a new optional that will have an URL based on the file, or an unused one in case the file is missing.
+
 We can easily combine two optionals:
 
 ```smalltalk

diff --git a/source/Buoy-Dynamic-Binding-Tests.package/BindingTest.class/methodProperties.json b/source/Buoy-Dynamic-Binding-Tests.package/BindingTest.class/methodProperties.json
diff --git a/source/Buoy-Dynamic-Binding-Tests.package/OptionalTest.class/instance/testReturn.st b/source/Buoy-Dynamic-Binding-Tests.package/OptionalTest.class/instance/testReturn.st
@@ -0,0 +1,6 @@
+tests-Combining
+testReturn
+
+	((Optional containing: 0) return: [ :number | number + 1 ]) withContentDo: [ :number | self assert: number equals: 1 ] ifUnused: [ self fail ].
+
+	(Optional unused return: [ :number | number + 1 ]) withContentDo: [ self fail ]
diff --git a/source/Buoy-Dynamic-Binding-Tests.package/OptionalTest.class/methodProperties.json b/source/Buoy-Dynamic-Binding-Tests.package/OptionalTest.class/methodProperties.json
diff --git a/source/Buoy-Dynamic-Binding-Tests.package/monticello.meta/version b/source/Buoy-Dynamic-Binding-Tests.package/monticello.meta/version
diff --git a/source/Buoy-Dynamic-Binding.package/Binding.class/methodProperties.json b/source/Buoy-Dynamic-Binding.package/Binding.class/methodProperties.json
diff --git a/source/Buoy-Dynamic-Binding.package/DefinedBinding.class/methodProperties.json b/source/Buoy-Dynamic-Binding.package/DefinedBinding.class/methodProperties.json
diff --git a/source/Buoy-Dynamic-Binding.package/Optional.class/instance/return..st b/source/Buoy-Dynamic-Binding.package/Optional.class/instance/return..st
@@ -0,0 +1,4 @@
+Combining
+return: aMonadycBlock
+
+	self subclassResponsibility 
diff --git a/source/Buoy-Dynamic-Binding.package/Optional.class/methodProperties.json b/source/Buoy-Dynamic-Binding.package/Optional.class/methodProperties.json
diff --git a/source/Buoy-Dynamic-Binding.package/UndefinedBinding.class/methodProperties.json b/source/Buoy-Dynamic-Binding.package/UndefinedBinding.class/methodProperties.json
diff --git a/source/Buoy-Dynamic-Binding.package/UnusedOptional.class/instance/return..st b/source/Buoy-Dynamic-Binding.package/UnusedOptional.class/instance/return..st
@@ -0,0 +1,4 @@
+Combining
+return: aMonadycBlock
+
+	^ self
diff --git a/source/Buoy-Dynamic-Binding.package/UnusedOptional.class/methodProperties.json b/source/Buoy-Dynamic-Binding.package/UnusedOptional.class/methodProperties.json
diff --git a/source/Buoy-Dynamic-Binding.package/UsedOptional.class/instance/return..st b/source/Buoy-Dynamic-Binding.package/UsedOptional.class/instance/return..st
@@ -0,0 +1,4 @@
+Combining
+return: aMonadycBlock
+
+	^ self class containing: (aMonadycBlock value: content)
diff --git a/source/Buoy-Dynamic-Binding.package/UsedOptional.class/methodProperties.json b/source/Buoy-Dynamic-Binding.package/UsedOptional.class/methodProperties.json
diff --git a/source/Buoy-Dynamic-Binding.package/monticello.meta/version b/source/Buoy-Dynamic-Binding.package/monticello.meta/version