Merge pull request #11 from freedomofpress/rebranding

Rebranding
freedomofpress · Apr 19, 2017 · 9fdd83c · 9fdd83c
2 parents a691fa0 + 720b6ff
commit 9fdd83c
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 34 deletions.
diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@ clean-build:
 	make build
 
 help:
-	@echo Makefile for building secret-splitter packages.
+	@echo Makefile for building sunder packages.
 	@echo Subcommands:
 	@echo "\t ansible: Fetch dependency Ansible roles for NodeJS config."
 	@echo "\t clean: Remove previously built binaries from release/ directory."

diff --git a/Vagrantfile b/Vagrantfile
@@ -4,12 +4,12 @@
 Vagrant.configure("2") do |config|
   config.vm.box = "ubuntu/trusty64"
   # config.vm.network "forwarded_port", guest: 80, host: 8080
-  config.vm.define "secretshare" do |secretshare|
-    secretshare.vm.hostname = "secretshare"
-    secretshare.vm.provision "ansible" do |ansible|
+  config.vm.define "sunder" do |sunder|
+    sunder.vm.hostname = "sunder"
+    sunder.vm.provision "ansible" do |ansible|
       ansible.playbook = "ansible/playbook.yml"
     end
-    secretshare.vm.provider "virtualbox" do |vb|
+    sunder.vm.provider "virtualbox" do |vb|
       # Building nodejs packages triggers the OOM killer with 512MB of RAM.
       vb.memory = 1024
     end

diff --git a/ansible/playbook.yml b/ansible/playbook.yml
@@ -1,9 +1,9 @@
 ---
-- name: Configure build machine for SecretShare.
+- name: Configure build machine for Sunder.
   hosts: all
   roles:
     - role: geerlingguy.nodejs
       become: yes
       nodejs_version: "4.x"
 
-    - role: secretshare-build
+    - role: sunder-build
diff --git a/...roles/secretshare-build/defaults/main.yml → ansible/roles/sunder-build/defaults/main.yml b/...roles/secretshare-build/defaults/main.yml → ansible/roles/sunder-build/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-# defaults file for secretshare-build
+# defaults file for sunder-build
 
 # The nodejs/npm config involves several environment variables set in
 # /etc/profile.d. By default Ansible runs with a minimal environment
@@ -8,7 +8,7 @@
 # running `npm` commands during the build process. By using a var, the
 # tasks remain DRY, referencing the same value for the `environment`
 # parameter.
-secretshare_nodejs_environment_map:
+sunder_nodejs_environment_map:
     NPM_CONFIG_PREFIX: "/usr/local/lib/npm"
     NODE_PATH: "/usr/lib/nodejs:/usr/lib/node_modules:/usr/share/javascript:/usr/local/lib/npm/lib/node_modules"
     PATH: "/usr/local/lib/npm/bin:{{ ansible_env.PATH }}"
diff --git a/...ble/roles/secretshare-build/meta/main.yml → ansible/roles/sunder-build/meta/main.yml b/...ble/roles/secretshare-build/meta/main.yml → ansible/roles/sunder-build/meta/main.yml
@@ -1,6 +1,6 @@
 galaxy_info:
   author: Conor Schaefer (@conorsch)
-  description: Configure build environment for SecretShare.
+  description: Configure build environment for Sunder.
   company: Freedom of the Press Foundation (@freedomofpress)
   license: MIT
   min_ansible_version: 2

diff --git a/...le/roles/secretshare-build/tasks/main.yml → ansible/roles/sunder-build/tasks/main.yml b/...le/roles/secretshare-build/tasks/main.yml → ansible/roles/sunder-build/tasks/main.yml
@@ -20,7 +20,7 @@
     state: present
     global: yes
     name: "{{ item }}"
-  environment: "{{ secretshare_nodejs_environment_map }}"
+  environment: "{{ sunder_nodejs_environment_map }}"
   with_items:
     - cross-env
     - webpack
@@ -31,12 +31,12 @@
 
 - name: Compile CSS and JS application code.
   command: npm run build-app
-  environment: "{{ secretshare_nodejs_environment_map }}"
+  environment: "{{ sunder_nodejs_environment_map }}"
   args:
     chdir: /vagrant
 
-- name: Build secret-share deb package.
+- name: Build Sunder deb package.
   command: npm run dist
-  environment: "{{ secretshare_nodejs_environment_map }}"
+  environment: "{{ sunder_nodejs_environment_map }}"
   args:
     chdir: /vagrant
diff --git a/app/app.html b/app/app.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>Secret Splitter</title>
+    <title>Sunder</title>
     <script>
       (function() {
         if (!process.env.HOT) {

diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "secret-splitter",
-  "productName": "Secret Splitter",
+  "name": "sunder",
+  "productName": "Sunder",
   "version": "0.0.1",
   "main": "main.js",
   "repository": "https://github.com/freedomofpress/secretshare.git",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "secret-splitter",
-  "productName": "Secret Splitter",
+  "name": "sunder",
+  "productName": "Sunder",
   "version": "0.0.1",
   "repository": "https://github.com/freedomofpress/secretshare.git",
   "description": "Desktop application providing a simple UI for the Shamir secret sharing scheme.",
@@ -19,14 +19,12 @@
     "start-hot": "cross-env HOT=1 NODE_ENV=development electron ./",
     "postinstall": "node node_modules/fbjs-scripts/node/check-dev-engines.js package.json && install-app-deps && node tasks/postinstall.js",
     "dev": "concurrently --kill-others \"npm run hot-server\" \"npm run start-hot\"",
-    "deb64": "electron-installer-debian --src release/linux-x64/SecretShare-linux-x64 --dest release/installers/ --arch amd64",
-    "debia32": "electron-installer-debian --src release/linux-ia32/SecretShare-linux-ia32 --dest release/installers/ --arch i386",
     "dist": "build"
   },
   "build": {
     "app-bundle-id": "apple.app.id",
     "app-category-type": "public.app-category.utilities",
-    "productName": "SecretSplitter",
+    "productName": "Sunder",
     "asar": false,
     "osx": {
       "background": "build/bg.jpg",
@@ -112,8 +110,8 @@
     "redux-thunk": "^2.0.0"
   },
   "devEngines": {
-    "node": "4.x || 5.x || 6.x",
-    "npm": "2.x || 3.x"
+    "node": "4.x || 5.x || 6.x || 7.x",
+    "npm": "2.x || 3.x || 4.x"
   },
   "nyc": {
     "include": [

diff --git a/src/components/Home.js b/src/components/Home.js
@@ -9,9 +9,7 @@ export default class Home extends Component {
   render() {
     return (
       <div className="container home">
-        <h1 className="home-title align-center">
-          Secret Splitter
-        </h1>
+        <h1 className="home-title align-center">Sunder</h1>
         <div className="home-actions align-center">
           <Button type="xlarge"
             icon={<PuzzleIcon className="split" />}
@@ -27,7 +25,7 @@ export default class Home extends Component {
           </Button>
         </div>
         <p className="home-explanation">
-          {"Secret Splitter is an implementation of Shamir's Secret Sharing scheme. " +
+          {"Sunder is an implementation of Shamir's Secret Sharing scheme. " +
             "Under this scheme a secret is split into some number of pieces, called 'shares.'" +
             ' A configurable quorum of these shares is required to recover the original secret. '}
         </p>

diff --git a/src/components/Layout.js b/src/components/Layout.js
@@ -8,7 +8,7 @@ export default function Layout(props) {
     <div className="layout-container">
       <div className="header">
         {header}
-        <h1 className="app-title">Secret Splitter</h1>
+        <h1 className="app-title">Sunder</h1>
       </div>
       <div className="content-container">
         {children}

diff --git a/src/components/Recover.js b/src/components/Recover.js
@@ -25,7 +25,7 @@ export default class Recover extends Component {
       instructionalContent = '';
     } else {
       instructionalContent = 'To recover a secret, start by providing ' +
-        'one of the secret shares. Secret Splitter will then prompt you for the ' +
+        'one of the secret shares. Sunder will then prompt you for the ' +
         'remaining shares needed to recover the shared secret.';
     }
 

diff --git a/src/components/ShareRow.js b/src/components/ShareRow.js
@@ -76,7 +76,7 @@ export default class ShareRow extends Component {
           <SaveFileButton contents={share}
             type="small"
             onSaved={this.handleSaved.bind(this)}
-            defaultPath={`secret-share-${index}.txt`} />
+            defaultPath={`secret-shard-${index}.txt`} />
         </div>
         {this.state.shown && modal}
       </div>

diff --git a/test/e2e.js b/test/e2e.js
@@ -36,7 +36,7 @@ describe('main window', function spec() {
 
   it('should open window', async () => {
     const title = await this.driver.getTitle();
-    expect(title).to.equal('Secret Splitter');
+    expect(title).to.equal('Sunder');
   });
 
   it('should click on the split button', async () => {
@@ -58,8 +58,8 @@ describe('main window', function spec() {
 
   it('should find and store the share values', async () => {
     // Depends on implementation of the copy button, less than ideal.
-    const secretShareEls = await this.driver.findElements({ css: 'input[readonly]' });
-    return Promise.all(secretShareEls.map((el) => el.getAttribute('value'))).then((values) => {
+    const shareEls = await this.driver.findElements({ css: 'input[readonly]' });
+    return Promise.all(shareEls.map((el) => el.getAttribute('value'))).then((values) => {
       // Store in global for later use
       shares = values;
     });