Make cockpit-composer the only package name

Drop the duality of welder-web vs. cockpit-composer and only keep the
latter name.

"welder-web" is kept for the GitHub and Zanata projects, these renames
need to happen separately.

.gitignore

@@ -9,7 +9,6 @@ public/po.*.js
 db.json
 core/build-version.json
 npm-debug.log
-welder-web.spec
 cockpit-composer.spec
 package-lock.json
 /po/etag-cache.json

.travis.yml

@@ -20,7 +20,7 @@ before_install:
         git rebase welder/master
 install:
   - |
-        if [ "$COMMAND" != "test_rpmbuild" ] && [ "$COMMAND" != "test_rpmbuild_cockpit-composer" ]; then
+        if [ "$COMMAND" != "test_rpmbuild" ]; then
             npm install
         fi
 env:
@@ -33,7 +33,6 @@ env:
     - COMMAND=stylelint
     - COMMAND=unit-test
     - COMMAND=test_rpmbuild
-    - COMMAND=test_rpmbuild_cockpit-composer
 script:
   - make "$COMMAND"
 jobs:

Dockerfile.buildrpm

@@ -2,7 +2,7 @@ FROM fedora:latest
 LABEL maintainer="Xiaofeng Wang" \
       email="xiaofwan@redhat.com" \
       baseimage="Fedora:latest" \
-      description="A welder-web RPM builder container running on Fedora"
+      description="A cockpit-composer RPM builder container running on Fedora"
 
 RUN dnf install -y make cmake rpm-build which gnupg tar xz curl jq nodejs python gcc gcc-c++ && dnf clean all
 

Makefile

@@ -46,23 +46,12 @@ $(PACKAGE_NAME).spec: $(PACKAGE_NAME).spec.in
 	    -e 's|@RELEASE@|$(RELEASE)|' \
 	    < $(PACKAGE_NAME).spec.in > $(PACKAGE_NAME).spec
 
-cockpit-composer.spec: cockpit-composer.spec.in
-	sed -e 's|@VERSION@|$(VERSION)|' \
-	    -e 's|@RELEASE@|$(RELEASE)|' \
-	    < cockpit-composer.spec.in > cockpit-composer.spec
-
 srpm: dist-gzip $(PACKAGE_NAME).spec
 	/usr/bin/rpmbuild -bs \
 	  --define "_sourcedir $(CURDIR)" \
 	  --define "_srcrpmdir $(CURDIR)" \
 	  $(PACKAGE_NAME).spec
 
-cockpit-composer-srpm: dist-gzip cockpit-composer.spec
-	/usr/bin/rpmbuild -bs \
-	  --define "_sourcedir $(CURDIR)" \
-	  --define "_srcrpmdir $(CURDIR)" \
-	  cockpit-composer.spec
-
 rpm: dist-gzip $(PACKAGE_NAME).spec
 	mkdir -p "`pwd`/output"
 	mkdir -p "`pwd`/rpmbuild"
@@ -77,20 +66,6 @@ rpm: dist-gzip $(PACKAGE_NAME).spec
 	find `pwd`/output -name '*.rpm' -printf '%f\n' -exec mv {} . \;
 	rm -r "`pwd`/rpmbuild"
 
-cockpit-composer-rpm: dist-gzip cockpit-composer.spec
-	mkdir -p "`pwd`/output"
-	mkdir -p "`pwd`/rpmbuild"
-	/usr/bin/rpmbuild -bb \
-	  --define "_sourcedir `pwd`" \
-	  --define "_specdir `pwd`" \
-	  --define "_builddir `pwd`/rpmbuild" \
-	  --define "_srcrpmdir `pwd`" \
-	  --define "_rpmdir `pwd`/output" \
-	  --define "_buildrootdir `pwd`/build" \
-	  cockpit-composer.spec
-	find `pwd`/output -name '*.rpm' -printf '%f\n' -exec mv {} . \;
-	rm -r "`pwd`/rpmbuild"
-
 tag:
 	@[ -n "$(NEWTAG)" ] || (echo "Run 'make NEWTAG=X.Y.Z tag' to tag a new release"; exit 1)
 	@git log --no-merges --pretty="format:- %s (%ae)" $(VERSION).. |sed -e 's/@.*)/)/' > clog.tmp
@@ -111,17 +86,14 @@ buildrpm_image:
 test_rpmbuild: buildrpm_image
 	sudo docker run --rm --name buildrpm -v `pwd`:/welder welder/buildrpm:latest make rpm srpm
 
-test_rpmbuild_cockpit-composer: buildrpm_image
-	sudo docker run --rm --name buildrpm -v `pwd`:/welder welder/buildrpm:latest make cockpit-composer-rpm cockpit-composer-srpm
-
 local-clean:
-	rm -rf test/images tmp cockpit-composer.spec cockpit-composer*.rpm welder-web*.tar.gz test/end-to-end/wdio_report
+	rm -rf test/images tmp $(PACKAGE_NAME).spec $(PACKAGE_NAME)*.rpm $(PACKAGE_NAME)*.tar.gz test/end-to-end/wdio_report
 
 # build VMs
-$(VM_IMAGE): local-clean cockpit-composer-rpm bots
+$(VM_IMAGE): local-clean rpm bots
 	# VM running cockpit, composer, and end to end test container
 	bots/image-customize -v \
-		-i `pwd`/cockpit-composer-*.noarch.rpm -i gcc-c++ \
+		-i `pwd`/$(PACKAGE_NAME)-*.noarch.rpm -i gcc-c++ \
 		-s $(CURDIR)/test/vm.install \
 		$(TEST_OS)
 
@@ -149,4 +121,4 @@ update-po:
 upload-pot: po-push
 download-po: po-pull
 
-.PHONY: tag welder-web.spec cockpit-composer.spec local-clean vm check
+.PHONY: tag local-clean vm check

README.md

@@ -1,9 +1,9 @@
-# Welder Web
+# Cockpit Composer
 
 [![Build Status](https://travis-ci.org/weldr/welder-web.svg?branch=master)](https://travis-ci.org/weldr/welder-web)
 [![codecov](https://codecov.io/gh/weldr/welder-web/branch/master/graph/badge.svg)](https://codecov.io/gh/weldr/welder-web)
 
-The web interface for Welder!
+The web interface for Composer!
 
 
 ### Getting Started
@@ -86,7 +86,7 @@ $ node run build                # Or, `node run build --release` for production
 
 ### Building a Docker image
 
-To build the Welder web application as a Docker image see
+To build the Cockpit Composer application as a Docker image see
 [`README.docker`](README.docker)
 
 ### License
@@ -189,11 +189,11 @@ used to collect the JSON files into a gettext-style POT file, and the POT file i
 **Step 4**. The developer runs `npm run translations:pull` and `npm run translations:po2json`. This downloads the translations from
 Zanata as gettext-style .po files and converts the .po files back to JSON.
 
-**Step 5**. The user runs welder-web. Based on the user's browser configuration, welder-web determines the user's preferred
+**Step 5**. The user runs cockpit-composer. Based on the user's browser configuration, cockpit-composer determines the user's preferred
 language, and if translations are available, these translations are provided to react-intl's `<IntlProvider>`. react-intl
 then displays translated strings where possible.
 
-### Making A New Release Of welder-web
+### Making A New Release Of cockpit-composer
 
 When the project is ready for a new release, do the following:
 
@@ -205,14 +205,9 @@ When the project is ready for a new release, do the following:
 
 Then push the tag with `git push --tags`. This will trigger
 [cockpituous](https://github.com/cockpit-project/cockpituous/tree/master/release)
-to build a new release of welder-web.
+to build a new release of cockpit-composer.
 
-#### Releasing cockpit-composer
-
-Do this after tagging a new release of `welder-web` as described above. It uses the same source.
-
- * Build a new `.srpm` with `make cockpit-composer-srpm`, this will also download new translations.
- * Import the new `.srpm` into the appropriate RHEL release
+Finally, import the new `.srpm` into the appropriate RHEL release.
 
 ---
 Made with ♥ by the Welder [team](https://github.com/orgs/weldr/people) and its contributors

cockpit-composer.spec.in

@@ -5,7 +5,7 @@ Summary:        Composer GUI for use with Cockpit
 
 License:        MIT
 URL:            http://weldr.io/
-Source0:        welder-web-%{version}.tar.gz
+Source0:        cockpit-composer-%{version}.tar.gz
 
 BuildArch:      noarch
 
@@ -16,7 +16,7 @@ Requires:       lorax-composer
 Composer GUI for Cockpit and lorax-composer
 
 %prep
-%setup -q -n welder-web-%{version}
+%setup -q -n cockpit-composer-%{version}
 
 %build
 # Nothing to build

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "welder-web",
+  "name": "cockpit-composer",
   "version": "0.0.1",
   "private": true,
   "engines": {

test/end-to-end/README.md

@@ -1,20 +1,10 @@
-# Welder End-To-End Test
+# Cockpit Composer End-To-End Test
 
-The end-to-end automation test for Welder! It is performed on the application
-level and tests whether the business requirements are met regardless of app
-internal architecture, dependencies, data integrity and such. Actually we need
-to follow the end-user flows and assert they get the intended experience and
-focus on the behavior of the thing as the user would see it.
-
-## Test Scenario
-
-### Cockpit Integrated Scenario
-
-Welder Web will be integrated into Cockpit in this scenario. Welder Web RPM
-will install into Cockpit. End-to-end test in this case is to make sure that
-the RPM package isn't missing important module and to make sure that the
-Welder Web is able to work with Cockpit. RPM sanity measure and Cockpit
-functional test will be covered in this scenario.
+The end-to-end automation test for Cockpit Composer! It is performed on the
+application level and tests whether the business requirements are met
+regardless of app internal architecture, dependencies, data integrity and such.
+Actually we need to follow the end-user flows and assert they get the intended
+experience and focus on the behavior of the thing as the user would see it.
 
 ## How To Test
 
@@ -60,7 +50,7 @@ To test cockpit-composer in different OS, set the `$TEST_OS` environment variabl
 ├── /components/                # Component inside page
 │   ├── Blueprint.component.js  # One blueprint group item in Blueprints page
 │   └── /...                    # etc.
-├── /pages/                     # Welder-Web page classes
+├── /pages/                     # Composer page classes
 │   ├── main.js                 # Top level page class and inherited by other page classes
 │   ├── createImage.js          # Create Image page class with tested elements included
 │   ├── createBlueprint.js      # Create Blueprint page class with tested elements included

test/end-to-end/package.json

@@ -1,7 +1,7 @@
 {
   "name": "end-to-end-test",
   "version": "1.0.0",
-  "description": "The end to end test for welder-web",
+  "description": "The end to end test for cockpit-composer",
   "scripts": {
     "test": "wdio"
   },

utils/cockpituous-release

@@ -1,12 +1,12 @@
-# This is a script run to release welder-web through Cockpituous:
+# This is a script run to release cockpit-composer through Cockpituous:
 # https://github.com/cockpit-project/cockpituous
 
 # Anything that start with 'job' may run in a way that it SIGSTOP's
 # itself when preliminary preparition and then gets a SIGCONT in
 # order to complete its work
 
 RELEASE_SOURCE="_release/source"
-RELEASE_SPEC="welder-web.spec"
+RELEASE_SPEC="cockpit-composer.spec"
 RELEASE_SRPM="_release/srpm"
 
 job release-source