Merge d55b1ff into 2470e04

.soliumignore

@@ -0,0 +1,3 @@
+node_modules
+examples/simple/node_modules
+examples/complex/node_modules

.soliumrc.json

@@ -0,0 +1,25 @@
+{
+  "extends": "solium:all",
+  "plugins": ["security"],
+  "rules": {
+    "imports-on-top": "warning",
+    "variable-declarations": "warning",
+    "array-declarations": "warning",
+    "operator-whitespace": "warning",
+    "lbrace": "warning",
+    "function-whitespace": "warning",
+    "semicolon-whitespace": "warning",
+    "comma-whitespace": "warning",
+    "conditionals-whitespace": "warning",
+    "quotes": ["warning", "double"],
+    "no-empty-blocks": "off",
+    "indentation": ["warning", 2],
+    "max-len": ["warning", 120],
+    "arg-overflow": ["warning", 3],
+    "no-constant": "error",
+    "security/enforce-explicit-visibility": "error",
+    "security/no-block-members": "warning",
+    "security/no-inline-assembly": "warning",
+    "arg-overflow": ["off"]
+  }
+}

.travis.yml

@@ -1,18 +1,31 @@
 language: node_js
 node_js:
 - '8'
+
 cache:
   directories:
   - node_modules
-env:
-  - 
-  - SOLIDITY_COVERAGE=true
-matrix:
+
+jobs:
+  # XXX fast_finish doesn't work with stages yet. See
+  # https://github.com/travis-ci/travis-ci/issues/8425
+  # --elopio - 20180531
   fast_finish: true
   allow_failures:
     - env: SOLIDITY_COVERAGE=true
-script:
-  - npm test
+  include:
+    # Run the unit test suite three times in parallel.
+    # The first one gets results faster and is the only one required to pass.
+    # The second one generates the coverage report.
+    - stage: unit
+      script: npm test
+    - stage: unit
+      script: npm run test
+      env: SOLIDITY_COVERAGE=true
+    # solidity and javascript style tests.
+    - stage: static
+      script: npm run lint:sol
+
 notifications:
   slack:
     rooms:

contracts/application/AppDirectory.sol

@@ -4,6 +4,7 @@ import "./versioning/ImplementationProvider.sol";
 import "./versioning/ImplementationDirectory.sol";
 import "openzeppelin-solidity/contracts/ownership/Ownable.sol";
 
+
 /**
  * @title AppDirectory
  * @dev Implementation directory with a standard library as a fallback provider.
@@ -40,8 +41,10 @@ contract AppDirectory is ImplementationDirectory {
    */
   function getImplementation(string contractName) public view returns (address) {
     address implementation = super.getImplementation(contractName);
-    if(implementation != address(0)) return implementation;
-    if(stdlib != address(0)) return stdlib.getImplementation(contractName);
+    if (implementation != address(0))
+      return implementation;
+    if (stdlib != address(0))
+      return stdlib.getImplementation(contractName);
     return address(0);
   }
 

contracts/application/BaseApp.sol

@@ -5,6 +5,7 @@ import "../upgradeability/AdminUpgradeabilityProxy.sol";
 import "../upgradeability/UpgradeabilityProxyFactory.sol";
 import "openzeppelin-solidity/contracts/ownership/Ownable.sol";
 
+
 /**
  * @title BaseApp
  * @dev Abstract base contract for upgradeable applications.
@@ -23,12 +24,6 @@ contract BaseApp is Ownable {
     factory = _factory;
   }
 
-  /**
-   * @dev Abstract function to return the implementation provider.
-   * @return The implementation provider.
-   */
-  function getProvider() internal view returns (ImplementationProvider);
-
   /**
    * @dev Returns the implementation address for a given contract name, provided by the `ImplementationProvider`.
    * @param contractName Name of the contract.
@@ -58,7 +53,7 @@ contract BaseApp is Ownable {
    * https://solidity.readthedocs.io/en/develop/abi-spec.html#function-selector-and-argument-encoding.
    * @return Address of the new proxy.
    */
-   function createAndCall(string contractName, bytes data) payable public returns (AdminUpgradeabilityProxy) {
+  function createAndCall(string contractName, bytes data) payable public returns (AdminUpgradeabilityProxy) {
     address implementation = getImplementation(contractName);
     return factory.createProxyAndCall.value(msg.value)(this, implementation, data);
   }
@@ -105,4 +100,11 @@ contract BaseApp is Ownable {
   function getProxyAdmin(AdminUpgradeabilityProxy proxy) public view returns (address) {
     return proxy.admin();
   }
+
+  /**
+   * @dev Abstract function to return the implementation provider.
+   * @return The implementation provider.
+   */
+  function getProvider() internal view returns (ImplementationProvider);
+
 }

contracts/application/PackagedApp.sol

@@ -4,6 +4,7 @@ import "./BaseApp.sol";
 import "./versioning/Package.sol";
 import "../upgradeability/UpgradeabilityProxyFactory.sol";
 
+
 /**
  * @title PackagedApp
  * @dev App for an upgradeable project that can use different versions.

contracts/application/UnversionedApp.sol

@@ -4,6 +4,7 @@ import "./BaseApp.sol";
 import "./versioning/ImplementationProvider.sol";
 import "../upgradeability/UpgradeabilityProxyFactory.sol";
 
+
 /**
  * @title UnversionedApp
  * @dev Basic implementation of an upgradable app with no versioning.
@@ -26,14 +27,6 @@ contract UnversionedApp is BaseApp {
     setProvider(_provider);
   }
 
-  /**
-   * @dev Returns the provider used by the app.
-   * @return The provider.
-   */
-  function getProvider() internal view returns (ImplementationProvider) {
-    return provider;
-  }
-
   /**
    * @dev Sets a new implementation provider.
    * @param _provider New implementation provider
@@ -42,4 +35,13 @@ contract UnversionedApp is BaseApp {
     require(address(_provider) != address(0));
     provider = _provider;
   }
+
+  /**
+   * @dev Returns the provider used by the app.
+   * @return The provider.
+   */
+  function getProvider() internal view returns (ImplementationProvider) {
+    return provider;
+  }
+
 }

contracts/application/versioning/FreezableImplementationDirectory.sol

@@ -2,11 +2,12 @@ pragma solidity ^0.4.21;
 
 import "./ImplementationDirectory.sol";
 
+
 /**
  * @title FreezableImplementationDirectory
  * @dev Implementation directory which can be made irreversibly immutable by the owner.
  */
- contract FreezableImplementationDirectory is ImplementationDirectory {
+contract FreezableImplementationDirectory is ImplementationDirectory {
   /// @dev Mutability state of the directory.
   bool public frozen;
 

contracts/application/versioning/ImplementationDirectory.sol

@@ -2,7 +2,8 @@ pragma solidity ^0.4.21;
 
 import "./ImplementationProvider.sol";
 import "openzeppelin-solidity/contracts/ownership/Ownable.sol";
-import 'openzeppelin-solidity/contracts/AddressUtils.sol';
+import "openzeppelin-solidity/contracts/AddressUtils.sol";
+
 
 /**
  * @title ImplementationDirectory

contracts/application/versioning/Package.sol

@@ -3,6 +3,7 @@ pragma solidity ^0.4.21;
 import "./ImplementationProvider.sol";
 import "openzeppelin-solidity/contracts/ownership/Ownable.sol";
 
+
 /**
  * @title Package
  * @dev Collection of contracts grouped into versions.

contracts/application/versioning/Release.sol

@@ -2,6 +2,7 @@ pragma solidity ^0.4.21;
 
 import "./FreezableImplementationDirectory.sol";
 
+
 /**
  * @title Release
  * @dev This contract represents a particular standard library version from a developer.

contracts/lifecycle/Migrations.sol

@@ -1,23 +1,25 @@
 pragma solidity ^0.4.21;
 
+
 contract Migrations {
   address public owner;
-  uint public last_completed_migration;
+  uint public lastCompletedMigration;
 
   modifier restricted() {
-    if (msg.sender == owner) _;
+    if (msg.sender == owner)
+      _;
   }
 
   function Migrations() public {
     owner = msg.sender;
   }
 
   function setCompleted(uint completed) public restricted {
-    last_completed_migration = completed;
+    lastCompletedMigration = completed;
   }
 
-  function upgrade(address new_address) public restricted {
-    Migrations upgraded = Migrations(new_address);
-    upgraded.setCompleted(last_completed_migration);
+  function upgrade(address newAddress) public restricted {
+    Migrations upgraded = Migrations(newAddress);
+    upgraded.setCompleted(lastCompletedMigration);
   }
 }

contracts/mocks/DummyImplementation.sol

@@ -1,9 +1,11 @@
 pragma solidity ^0.4.21;
 
+
 contract Impl {
-  function version() public pure returns (string); 
+  function version() public pure returns (string);
 }
 
+
 contract DummyImplementation {
   uint256 public value;
   string public text;
@@ -28,6 +30,7 @@ contract DummyImplementation {
   }
 }
 
+
 contract DummyImplementationV2 is DummyImplementation {
   function migrate(uint256 newVal) public {
     value = newVal;

contracts/mocks/InitializableMock.sol

@@ -2,6 +2,7 @@ pragma solidity ^0.4.21;
 
 import "../migrations/Initializable.sol";
 
+
 /**
  * @title InitializableMock
  * @dev This contract is a mock to test initializable functionality

contracts/mocks/MigratableMock.sol

@@ -2,6 +2,7 @@ pragma solidity ^0.4.21;
 
 import "../migrations/Migratable.sol";
 
+
 /**
  * @title MigratableMock
  * @dev This contract is a mock to test upgradeability functionality